From: Sage Weil <sage@redhat.com>
Date: Mon, 29 Oct 2018 01:21:53 +0000 (-0500)
Subject: osd: fix heartbeat_reset unlock
X-Git-Tag: v13.2.3~17^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5ba5fbf3058e044381091c49d821b36337389c4a;p=ceph.git

osd: fix heartbeat_reset unlock

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)
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 265224775a1..1fb8ca036c0 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -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());