]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
librbd: acquire cache_lock before refreshing parent 4496/head
authorJason Dillaman <dillaman@redhat.com>
Mon, 16 Mar 2015 15:04:22 +0000 (11:04 -0400)
committerLoic Dachary <ldachary@redhat.com>
Wed, 29 Apr 2015 17:31:54 +0000 (19:31 +0200)
commit0cdc93fbdcf68a31e6aada38b0cb9d66efdc512d
tree287fec89e8c826f68782d14c7808626e23460d09
parenta1b4aeb8e8c3a8d5c8284dcee8e03f501a77928c
librbd: acquire cache_lock before refreshing parent

cache_lock needs to be acquired before snap_lock to avoid
the potential for deadlock.

Fixes: #5488
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 703ba377e3de4007920f2ed7d8a0780f68676fe2)

Conflicts:
src/librbd/internal.cc
        resolved by moving int r; in the scope of the block
src/librbd/ImageCtx.cc
src/librbd/internal.cc