]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #7118 from efirs/ef_rwlock_for_index_manager
authorSamuel Just <sjust@redhat.com>
Tue, 17 May 2016 18:56:31 +0000 (11:56 -0700)
committerSamuel Just <sjust@redhat.com>
Tue, 17 May 2016 18:56:31 +0000 (11:56 -0700)
os/fileStore: Replace Mutex with RWLock in IndexManager

Reviewed-by: Samuel Just <sjust@redhat.com>
1  2 
src/os/filestore/IndexManager.cc
src/os/filestore/IndexManager.h

Simple merge
index 5317d2bc1fe95f0071ed6d80c0abfa5dca2d49f7,433211d01bc4a292d487c8ebe02ec2a8e4f21003..c5748a5f60b7be687b4b077eb2e9158e588e0008
@@@ -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();