059a9447e2
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com> Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
46 lines
1.7 KiB
Diff
46 lines
1.7 KiB
Diff
From 31ea5889c25012189aabe51157b32cfbe87a63be Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
|
|
Date: Mon, 17 Feb 2020 10:43:22 +0100
|
|
Subject: [PATCH qemu 37/39] 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 <f.gruenbichler@proxmox.com>
|
|
---
|
|
block/mirror.c | 8 ++++----
|
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/block/mirror.c b/block/mirror.c
|
|
index 40d174a625..d6aca2874e 100644
|
|
--- a/block/mirror.c
|
|
+++ b/block/mirror.c
|
|
@@ -735,8 +735,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);
|
|
@@ -1727,8 +1727,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);
|
|
+ bdrv_dirty_bitmap_merge_internal(s->dirty_bitmap, s->sync_bitmap,
|
|
+ NULL, true);
|
|
if (local_err) {
|
|
goto fail;
|
|
}
|
|
--
|
|
2.20.1
|
|
|