summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSage Weil <sage@redhat.com>2018-10-28 20:21:53 -0500
committerSage Weil <sage@redhat.com>2018-10-28 20:22:37 -0500
commit1a0e2f7e1518d57bc07176f4297315a7c9a3c139 (patch)
treede35c2ac36cf312b1c78323d680b037c54c6dd53
parentb17398aea8772f1e874d2e99835a96367848afa9 (diff)
downloadceph-1a0e2f7e1518d57bc07176f4297315a7c9a3c139.tar.gz
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>
-rw-r--r--src/osd/OSD.cc1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 834083fabe7..ce3df3145cf 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());