[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 1/3] block: block_dirty_bitmap_merge(): fix error path
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[PATCH v4 1/3] block: block_dirty_bitmap_merge(): fix error path |
Date: |
Tue, 17 May 2022 14:12:04 +0300 |
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>
---
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.1