objecter: drop linger_info_mutex

Signed-off-by: Sage Weil <sage@newdream.net>

diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc
index cd927e54a29d6e07b56792a29cc4baf73a39fdf8..349762699b881ee05c5d43809a973440302cb1c7 100644 (file)
--- a/src/osdc/Objecter.cc
+++ b/src/osdc/Objecter.cc
@@ -103,7 +103,6 @@ void Objecter::_linger_commit(LingerOp *info, int r)
 
 void Objecter::unregister_linger(uint64_t linger_id)
 {
-  Mutex::Locker locker(linger_info_mutex);
   map<uint64_t, LingerOp*>::iterator iter = op_linger_info.find(linger_id);
   if (iter != op_linger_info.end()) {
     LingerOp *info = iter->second;

diff --git a/src/osdc/Objecter.h b/src/osdc/Objecter.h
index a843266511319138cbb14be54e1b4a50e6327beb..fa2da08c22aea5a2cf2f3d1fa454b944b6b3b935 100644 (file)
--- a/src/osdc/Objecter.h
+++ b/src/osdc/Objecter.h
@@ -471,7 +471,6 @@ public:
   };
 
   map<uint64_t, LingerOp*>  op_linger_info;
-  Mutex linger_info_mutex;
 
   struct C_Linger_Ack : public Context {
     Objecter *objecter;
@@ -536,7 +535,6 @@ public:
     last_seen_osdmap_version(0),
     last_seen_pgmap_version(0),
     client_lock(l), timer(t),
-    linger_info_mutex("Objecter::linger_info_mutex"),
     op_throttler(g_conf.objecter_inflight_op_bytes)
   { }
   ~Objecter() { }