mds: fix double-unlock on shutdown

We did a bad backport or something and accidentally ended up with two Unlock()
calls on mds_lock. Don't.

Signed-off-by: Greg Farnum <gfarnum@redhat.com>

diff --git a/src/mds/MDSRank.cc b/src/mds/MDSRank.cc
index 8ddd2faa40c24c7cfc6b98bf429b2af3caf78186..5c2bfe39ebb4101637466261611e32cfaf6d522e 100644 (file)
--- a/src/mds/MDSRank.cc
+++ b/src/mds/MDSRank.cc
@@ -242,13 +242,7 @@ void MDSRankDispatcher::shutdown()
   mds_lock.Unlock();
 
   finisher->stop(); // no flushing
-
-  // shut down messenger
-  // release mds_lock first because messenger thread might call 
-  // MDSDaemon::ms_handle_reset which will try to hold mds_lock
-  mds_lock.Unlock();
   messenger->shutdown();
-  mds_lock.Lock();
 
   mds_lock.Lock();