MemStore: remove apply_lock

It doesn't block anything other than the umount caller itself.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>

diff --git a/src/os/memstore/MemStore.cc b/src/os/memstore/MemStore.cc
index d820e2829a44b9f51a1944a923d4742237e892d5..29a8be5f29e6e7fc4501033f108b2285b25503ff 100644 (file)
--- a/src/os/memstore/MemStore.cc
+++ b/src/os/memstore/MemStore.cc
@@ -60,7 +60,6 @@ int MemStore::umount()
 int MemStore::_save()
 {
   dout(10) << __func__ << dendl;
-  Mutex::Locker l(apply_lock); // block any writer
   dump_all();
   set<coll_t> collections;
   for (ceph::unordered_map<coll_t,CollectionRef>::iterator p = coll_map.begin();

diff --git a/src/os/memstore/MemStore.h b/src/os/memstore/MemStore.h
index ac410a1d5d63066b00d56858f78d6c1efad08a52..6895011e97fe9fc7e5db6755c06924a30275728f 100644 (file)
--- a/src/os/memstore/MemStore.h
+++ b/src/os/memstore/MemStore.h
@@ -292,7 +292,6 @@ private:
 
   ceph::unordered_map<coll_t, CollectionRef> coll_map;
   RWLock coll_lock;    ///< rwlock to protect coll_map
-  Mutex apply_lock;    ///< serialize all updates
 
   CollectionRef get_collection(coll_t cid);
 
@@ -342,7 +341,6 @@ public:
     : ObjectStore(path),
       cct(cct),
       coll_lock("MemStore::coll_lock"),
-      apply_lock("MemStore::apply_lock"),
       finisher(cct),
       used_bytes(0) {}
   ~MemStore() { }