aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin Wolf <kwolf@redhat.com>2018-10-18 15:17:26 +0200
committerKevin Wolf <kwolf@redhat.com>2018-11-05 15:09:55 +0100
commita51b9c4862c29f427931f45ee1d39ac1663ba859 (patch)
treee333b896bf1368885cd053425469843d52e4975d
parente35bdc123a4ace9f4d3fccaaf88907014e2438cd (diff)
rbd: Close image in qemu_rbd_open() error path
Commit e2b8247a322 introduced an error path in qemu_rbd_open() after calling rbd_open(), but neglected to close the image again in this error path. The error path should contain everything that the regular close function qemu_rbd_close() contains. This adds the missing rbd_close() call. Signed-off-by: Kevin Wolf <kwolf@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com>
-rw-r--r--block/rbd.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/block/rbd.c b/block/rbd.c
index e5bf5a146f..1e9819a50f 100644
--- a/block/rbd.c
+++ b/block/rbd.c
@@ -787,6 +787,7 @@ static int qemu_rbd_open(BlockDriverState *bs, QDict *options, int flags,
"automatically marking the image read-only.");
r = bdrv_set_read_only(bs, true, &local_err);
if (r < 0) {
+ rbd_close(s->image);
error_propagate(errp, local_err);
goto failed_open;
}