From 8c6f52215240f48b5e4d5bb99a5f2f451e7ce70a Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 16 Jan 2013 13:14:00 -0800 Subject: [PATCH] osd: leave osd_lock locked in shutdown() No callers expect the lock to be dropped. Fixes: #3816 Signed-off-by: Sage Weil (cherry picked from commit 98a763123240803741ac9f67846b8f405f1b005b) --- src/osd/OSD.cc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index e50050092501c..023bd9b3406e5 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(); -- 2.39.5