From e773794d90eef974f98e88b23643e4a9dbba538a Mon Sep 17 00:00:00 2001 From: xie xingguo Date: Fri, 15 Jan 2016 11:06:19 +0800 Subject: [PATCH] MemStore: remove apply_lock It doesn't block anything other than the umount caller itself. Signed-off-by: xie xingguo --- src/os/memstore/MemStore.cc | 1 - src/os/memstore/MemStore.h | 2 -- 2 files changed, 3 deletions(-) diff --git a/src/os/memstore/MemStore.cc b/src/os/memstore/MemStore.cc index d820e2829a4..29a8be5f29e 100644 --- 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 collections; for (ceph::unordered_map::iterator p = coll_map.begin(); diff --git a/src/os/memstore/MemStore.h b/src/os/memstore/MemStore.h index ac410a1d5d6..6895011e97f 100644 --- a/src/os/memstore/MemStore.h +++ b/src/os/memstore/MemStore.h @@ -292,7 +292,6 @@ private: ceph::unordered_map 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() { } -- 2.47.3