diff options
| author | Sage Weil <sage@inktank.com> | 2013-01-16 13:14:00 -0800 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-02-26 17:50:22 -0800 |
| commit | 8c6f52215240f48b5e4d5bb99a5f2f451e7ce70a (patch) | |
| tree | cde19c79fec66f938f7cbbc962b2b105c03fe357 | |
| parent | a324d999804b4648f245ee36b3bd611b3d139d5d (diff) | |
| download | ceph-8c6f52215240f48b5e4d5bb99a5f2f451e7ce70a.tar.gz | |
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)
| -rw-r--r-- | src/osd/OSD.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index e5005009250..023bd9b3406 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(); |