]>
Commit | Line | Data |
---|---|---|
059a9447 FG |
1 | From 31ea5889c25012189aabe51157b32cfbe87a63be Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com> | |
3 | Date: Mon, 17 Feb 2020 10:43:22 +0100 | |
4 | Subject: [PATCH qemu 37/39] mirror: switch to bdrv_dirty_bitmap_merge_internal | |
5 | MIME-Version: 1.0 | |
6 | Content-Type: text/plain; charset=UTF-8 | |
7 | Content-Transfer-Encoding: 8bit | |
8 | ||
9 | since sync_bitmap is busy at the point of merging, and we checked access | |
10 | beforehand. | |
11 | ||
12 | Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com> | |
13 | --- | |
14 | block/mirror.c | 8 ++++---- | |
15 | 1 file changed, 4 insertions(+), 4 deletions(-) | |
16 | ||
17 | diff --git a/block/mirror.c b/block/mirror.c | |
18 | index 40d174a625..d6aca2874e 100644 | |
19 | --- a/block/mirror.c | |
20 | +++ b/block/mirror.c | |
21 | @@ -735,8 +735,8 @@ static int mirror_exit_common(Job *job) | |
22 | job->ret == 0 && ret == 0)) { | |
23 | /* Success; synchronize copy back to sync. */ | |
24 | bdrv_clear_dirty_bitmap(s->sync_bitmap, NULL); | |
25 | - bdrv_merge_dirty_bitmap(s->sync_bitmap, s->dirty_bitmap, | |
26 | - NULL, &error_abort); | |
27 | + bdrv_dirty_bitmap_merge_internal(s->sync_bitmap, s->dirty_bitmap, | |
28 | + NULL, true); | |
29 | } | |
30 | } | |
31 | bdrv_release_dirty_bitmap(s->dirty_bitmap); | |
32 | @@ -1727,8 +1727,8 @@ static BlockJob *mirror_start_job( | |
33 | } | |
34 | ||
35 | if (s->sync_mode == MIRROR_SYNC_MODE_BITMAP) { | |
36 | - bdrv_merge_dirty_bitmap(s->dirty_bitmap, s->sync_bitmap, | |
37 | - NULL, &local_err); | |
38 | + bdrv_dirty_bitmap_merge_internal(s->dirty_bitmap, s->sync_bitmap, | |
39 | + NULL, true); | |
40 | if (local_err) { | |
41 | goto fail; | |
42 | } | |
43 | -- | |
44 | 2.20.1 | |
45 |