From: Greg Farnum <gfarnum@redhat.com>
Date: Wed, 24 Aug 2016 20:34:43 +0000 (-0700)
Subject: mds: fix double-unlock on shutdown
X-Git-Tag: v10.2.3~8^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F10847%2Fhead;p=ceph.git

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 8ddd2faa40c2..5c2bfe39ebb4 100644
--- 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();