From: Sage Weil <sage@inktank.com>
Date: Wed, 16 Jan 2013 21:14:00 +0000 (-0800)
Subject: osd: leave osd_lock locked in shutdown()
X-Git-Tag: v0.56.4~54
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8c6f52215240f48b5e4d5bb99a5f2f451e7ce70a;p=ceph.git

osd: leave osd_lock locked in shutdown()

No callers expect the lock to be dropped.

Fixes: #3816
Signed-off-by: Sage Weil <sage@inktank.com>
(cherry picked from commit 98a763123240803741ac9f67846b8f405f1b005b)
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index e50050092501..023bd9b3406e 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -1224,8 +1224,6 @@ int OSD::shutdown()
   hbserver_messenger->shutdown();
 
   monc->shutdown();
-
-  osd_lock.Unlock();
   return r;
 }
 
@@ -3456,7 +3454,8 @@ void OSD::_dispatch(Message *m)
     session = (Session *)m->get_connection()->get_priv();
     if (!session ||
 	session->entity_name.is_mon() ||
-	session->entity_name.is_osd()) shutdown();
+	session->entity_name.is_osd())
+      shutdown();
     else dout(0) << "shutdown message from connection with insufficient privs!"
 		 << m->get_connection() << dendl;
     m->put();