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: v12.2.11~135^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9d80d7514fc8f0737440a09b1874f2ec84bf2848;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)

Conflicts:
	src/osd/OSD.cc
- luminous has a s->put() call that was subsequently removed
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 6e552267b982..131628ad5393 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -5259,7 +5259,6 @@ bool OSD::heartbeat_reset(Connection *con)
   HeartbeatSession *s = static_cast<HeartbeatSession*>(con->get_priv());
   if (s) {
     if (is_stopping()) {
-      heartbeat_lock.Unlock();
       s->put();
       return true;
     }