From 9d80d7514fc8f0737440a09b1874f2ec84bf2848 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@redhat.com>
Date: Sun, 28 Oct 2018 20:21:53 -0500
Subject: [PATCH] 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
---
 src/osd/OSD.cc | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 6e552267b982c..131628ad53936 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;
     }
-- 
2.39.5