]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 68e331d) | patch
osd: fix heartbeat_reset unlock 25035/head
authorSage Weil <sage@redhat.com>
Mon, 29 Oct 2018 01:21:53 +0000 (20:21 -0500)
committerNathan Cutler <ncutler@suse.com>
Sat, 10 Nov 2018 23:25:01 +0000 (00:25 +0100)
commit9d80d7514fc8f0737440a09b1874f2ec84bf2848
tree30fbac55150616379bffa693265294c6e896a2b8tree | snapshot
parent68e331d04dd844bd4bef1385cf440333eeb7e1fccommit | diff
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 diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.