From e39d1867ceea7910937bf8bfbd9491e33dc26111 Mon Sep 17 00:00:00 2001 From: Kevin Wolf Date: Thu, 10 Jan 2019 12:44:33 +0000 Subject: [PATCH 03/14] rbd: Close image in qemu_rbd_open() error path MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit RH-Author: Kevin Wolf Message-id: <20190110124442.30132-4-kwolf@redhat.com> Patchwork-id: 83951 O-Subject: [RHEL-8.0 qemu-kvm PATCH 03/12] rbd: Close image in qemu_rbd_open() error path Bugzilla: 1644996 RH-Acked-by: Max Reitz RH-Acked-by: Stefan Hajnoczi RH-Acked-by: Philippe Mathieu-Daudé RH-Acked-by: Eric Blake 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 Reviewed-by: Eric Blake (cherry picked from commit a51b9c4862c29f427931f45ee1d39ac1663ba859) Signed-off-by: Kevin Wolf Signed-off-by: Danilo C. L. de Paula --- block/rbd.c | 1 + 1 file changed, 1 insertion(+) diff --git a/block/rbd.c b/block/rbd.c index ebe0701..dc369d0 100644 --- a/block/rbd.c +++ b/block/rbd.c @@ -780,6 +780,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; } -- 1.8.3.1