]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osd: fix heartbeat_reset unlock 25026/head
authorSage Weil <sage@redhat.com>
Mon, 29 Oct 2018 01:21:53 +0000 (20:21 -0500)
committerNathan Cutler <ncutler@suse.com>
Sat, 10 Nov 2018 23:22:34 +0000 (00:22 +0100)
Fixes 51d8e2457d73c709bfa4f706793696b3ce704ff9, which moved to lock_guard
but didn't remove the unlock call on this exit path.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 1a0e2f7e1518d57bc07176f4297315a7c9a3c139)

src/osd/OSD.cc

index 265224775a189aef103b00732b7cc50595aec4da..1fb8ca036c0f6653c4dbce5d9b7f3fd522a4f7c3 100644 (file)
@@ -4760,7 +4760,6 @@ bool OSD::heartbeat_reset(Connection *con)
   auto s = con->get_priv();
   if (s) {
     if (is_stopping()) {
-      heartbeat_lock.Unlock();
       return true;
     }
     auto heartbeat_session = static_cast<HeartbeatSession*>(s.get());