]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
rbd: don't forget to call close_image() if remove_child() fails
authorIlya Dryomov <ilya.dryomov@inktank.com>
Wed, 29 Jan 2014 14:12:01 +0000 (16:12 +0200)
committerJosh Durgin <josh.durgin@inktank.com>
Sat, 9 Aug 2014 22:30:48 +0000 (15:30 -0700)
commit61e2219dd07ebb856a61f54e8cd992dc1e16f5d9
tree82eed434aa54b539031ac23f4f8de1b382dc3cbb
parent2c6c23cee7ff2a8f56f3986051d43824b7bd3526
rbd: don't forget to call close_image() if remove_child() fails

close_image() among other things unregisters a watcher that's been
registered by open_image().  Even though it'll timeout in 30 or so
seconds, it's not nice now that we check for watchers before starting
the removal process.

Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com>
(cherry picked from commit 4ebc32f37a4860bdc676491bf8b042c18fd619cf)
src/librbd/internal.cc