From: Lu Shi <shi.lu@h3c.com>
Date: Fri, 11 Sep 2015 02:35:03 +0000 (+0800)
Subject: osd:the fuction osd::shutdown Lock failed.
X-Git-Tag: v9.1.0~129^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F5870%2Fhead;p=ceph.git

osd:the fuction osd::shutdown Lock failed.

Fixed:#13004

Signed-off-by: Lu Shi <shi.lu@h3c.com>
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index a577fd802c82..273f2d3534f3 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -6469,8 +6469,10 @@ void OSD::handle_osd_map(MOSDMap *m)
   else if (do_restart)
     start_boot();
 
+  osd_lock.Unlock();
   if (do_shutdown)
     shutdown();
+  osd_lock.Lock();
 
   m->put();
 }