From: Samuel Just Date: Tue, 17 May 2016 18:56:31 +0000 (-0700) Subject: Merge pull request #7118 from efirs/ef_rwlock_for_index_manager X-Git-Tag: v11.0.0~529 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0af9bb6de4c4cad66b2193bf070025298df08139;p=ceph.git Merge pull request #7118 from efirs/ef_rwlock_for_index_manager os/fileStore: Replace Mutex with RWLock in IndexManager Reviewed-by: Samuel Just --- 0af9bb6de4c4cad66b2193bf070025298df08139 diff --cc src/os/filestore/IndexManager.h index 5317d2bc1fe9,433211d01bc4..c5748a5f60b7 --- a/src/os/filestore/IndexManager.h +++ b/src/os/filestore/IndexManager.h @@@ -65,10 -65,11 +65,11 @@@ class IndexManager * @return error code */ int build_index(coll_t c, const char *path, CollectionIndex **index); + bool get_index_optimistic(coll_t c, Index *index); public: /// Constructor - IndexManager(bool upgrade) : lock("IndexManager lock"), - upgrade(upgrade) {} + explicit IndexManager(bool upgrade) : lock("IndexManager lock"), + upgrade(upgrade) {} ~IndexManager();