mds: pass resets to objecter, with proper locking

diff --git a/src/mds/MDS.cc b/src/mds/MDS.cc
index 139fa59d5b3e7554dd423c7b74591f2fe9f11328..e695e43f43fdb958b0be06fc296687f6860508b9 100644 (file)
--- a/src/mds/MDS.cc
+++ b/src/mds/MDS.cc
@@ -1398,20 +1398,22 @@ bool MDS::_dispatch(Message *m)
 
 void MDS::ms_handle_failure(Connection *con, Message *m, const entity_addr_t& addr) 
 {
-  mds_lock.Lock();
+  Mutex::Locker l(mds_lock);
   dout(0) << "ms_handle_failure to " << addr << " on " << *m << dendl;
-  mds_lock.Unlock();
 }
 
 bool MDS::ms_handle_reset(Connection *con, const entity_addr_t& addr) 
 {
+  Mutex::Locker l(mds_lock);
   dout(0) << "ms_handle_reset on " << addr << dendl;
+  objecter->ms_handle_reset(addr);
   return false;
 }
 
 
 void MDS::ms_handle_remote_reset(Connection *con, const entity_addr_t& addr) 
 {
+  Mutex::Locker l(mds_lock);
   dout(0) << "ms_handle_remote_reset on " << addr << dendl;
   objecter->ms_handle_remote_reset(addr);
 }