]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osd: fix heartbeat_reset unlock 24796/head
authorSage Weil <sage@redhat.com>
Mon, 29 Oct 2018 01:21:53 +0000 (20:21 -0500)
committerSage Weil <sage@redhat.com>
Mon, 29 Oct 2018 01:22:37 +0000 (20:22 -0500)
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>
src/osd/OSD.cc

index 834083fabe7e5e7f095533e23d347332f416ed48..ce3df3145cfcc576e901fb5efe1200f978a2804b 100644 (file)
@@ -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());