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: v14.0.1~1^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F24796%2Fhead;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>
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 834083fabe7e..ce3df3145cfc 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -4961,7 +4961,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());