Merge pull request #5870 from s09816/master

osd:the fuction osd::shutdown Lock failed.

Reviewed-by: Kefu Chai <kchai@redhat.com>
This commit is contained in:
Kefu Chai 2015-09-17 18:52:54 +08:00
commit 6e8e0e7bb5

View File

@ -6479,8 +6479,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();
}