From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= Date: Mon, 6 Apr 2020 12:17:06 +0200 Subject: [PATCH] mirror: switch to bdrv_dirty_bitmap_merge_internal MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit since sync_bitmap is busy at the point of merging, and we checked access beforehand. Signed-off-by: Fabian Grünbichler Signed-off-by: Thomas Lamprecht --- block/mirror.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/block/mirror.c b/block/mirror.c index c688726fae..a7f829f766 100644 --- a/block/mirror.c +++ b/block/mirror.c @@ -787,8 +787,8 @@ static int mirror_exit_common(Job *job) job->ret == 0 && ret == 0)) { /* Success; synchronize copy back to sync. */ bdrv_clear_dirty_bitmap(s->sync_bitmap, NULL); - bdrv_merge_dirty_bitmap(s->sync_bitmap, s->dirty_bitmap, - NULL, &error_abort); + bdrv_dirty_bitmap_merge_internal(s->sync_bitmap, s->dirty_bitmap, + NULL, true); } } bdrv_release_dirty_bitmap(s->dirty_bitmap); @@ -1835,11 +1835,8 @@ static BlockJob *mirror_start_job( } if (s->sync_mode == MIRROR_SYNC_MODE_BITMAP) { - bdrv_merge_dirty_bitmap(s->dirty_bitmap, s->sync_bitmap, - NULL, &local_err); - if (local_err) { - goto fail; - } + bdrv_dirty_bitmap_merge_internal(s->dirty_bitmap, s->sync_bitmap, + NULL, true); } ret = block_job_add_bdrv(&s->common, "source", bs, 0,