From 577336e20f68aa289311103e54d4def793b0cc01 Mon Sep 17 00:00:00 2001 From: Greg Farnum Date: Wed, 24 Aug 2016 13:34:43 -0700 Subject: [PATCH] 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 --- src/mds/MDSRank.cc | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/mds/MDSRank.cc b/src/mds/MDSRank.cc index 8ddd2faa40c24..5c2bfe39ebb41 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(); -- 2.39.5