[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v2 03/20] block: block_dirty_bitmap_merge(): fix error path
From: |
Kevin Wolf |
Subject: |
[PULL v2 03/20] block: block_dirty_bitmap_merge(): fix error path |
Date: |
Fri, 24 Jun 2022 17:40:46 +0200 |
From: Vladimir Sementsov-Ogievskiy <vsementsov@openvz.org>
At the end we ignore failure of bdrv_merge_dirty_bitmap() and report
success. And still set errp. That's wrong.
Signed-off-by: Vladimir Sementsov-Ogievskiy <v.sementsov-og@mail.ru>
Reviewed-by: Nikita Lapshin <nikita.lapshin@virtuozzo.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Message-Id: <20220517111206.23585-2-v.sementsov-og@mail.ru>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
block/monitor/bitmap-qmp-cmds.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/block/monitor/bitmap-qmp-cmds.c b/block/monitor/bitmap-qmp-cmds.c
index 2b677c4a2f..bd10468596 100644
--- a/block/monitor/bitmap-qmp-cmds.c
+++ b/block/monitor/bitmap-qmp-cmds.c
@@ -309,7 +309,10 @@ BdrvDirtyBitmap *block_dirty_bitmap_merge(const char
*node, const char *target,
}
/* Merge into dst; dst is unchanged on failure. */
- bdrv_merge_dirty_bitmap(dst, anon, backup, errp);
+ if (!bdrv_merge_dirty_bitmap(dst, anon, backup, errp)) {
+ dst = NULL;
+ goto out;
+ }
out:
bdrv_release_dirty_bitmap(anon);
--
2.35.3
- [PULL v2 00/20] Block layer patches, Kevin Wolf, 2022/06/24
- [PULL v2 04/20] block: improve block_dirty_bitmap_merge(): don't allocate extra bitmap, Kevin Wolf, 2022/06/24
- [PULL v2 02/20] block: get rid of blk->guest_block_size, Kevin Wolf, 2022/06/24
- [PULL v2 01/20] block: drop unused bdrv_co_drain() API, Kevin Wolf, 2022/06/24
- [PULL v2 05/20] block: simplify handling of try to merge different sized bitmaps, Kevin Wolf, 2022/06/24
- [PULL v2 06/20] block: Support passing NULL ops to blk_set_dev_ops(), Kevin Wolf, 2022/06/24
- [PULL v2 09/20] linux-headers: Add vduse.h, Kevin Wolf, 2022/06/24
- [PULL v2 08/20] block/export: Abstract out the logic of virtio-blk I/O process, Kevin Wolf, 2022/06/24
- [PULL v2 12/20] vduse-blk: Add vduse-blk resize support, Kevin Wolf, 2022/06/24
- [PULL v2 03/20] block: block_dirty_bitmap_merge(): fix error path,
Kevin Wolf <=
- [PULL v2 07/20] block/export: Fix incorrect length passed to vu_queue_push(), Kevin Wolf, 2022/06/24
- [PULL v2 15/20] block/rbd: report a better error when namespace does not exist, Kevin Wolf, 2022/06/24
- [PULL v2 17/20] aio_wait_kick: add missing memory barrier, Kevin Wolf, 2022/06/24
- [PULL v2 11/20] vduse-blk: Implement vduse-blk export, Kevin Wolf, 2022/06/24
- [PULL v2 14/20] qsd: document vduse-blk exports, Kevin Wolf, 2022/06/24
- [PULL v2 16/20] block/gluster: correctly set max_pdiscard, Kevin Wolf, 2022/06/24
- [PULL v2 10/20] libvduse: Add VDUSE (vDPA Device in Userspace) library, Kevin Wolf, 2022/06/24
- [PULL v2 13/20] libvduse: Add support for reconnecting, Kevin Wolf, 2022/06/24