Blame SOURCES/kvm-block-dirty-bitmap-add-lock-to-bdrv_enable-disable_d.patch

26ba25
From 7879107e37dd742ffeff6f943671ae6c49c75876 Mon Sep 17 00:00:00 2001
26ba25
From: John Snow <jsnow@redhat.com>
26ba25
Date: Wed, 18 Jul 2018 22:54:37 +0200
26ba25
Subject: [PATCH 219/268] block/dirty-bitmap: add lock to
26ba25
 bdrv_enable/disable_dirty_bitmap
26ba25
26ba25
RH-Author: John Snow <jsnow@redhat.com>
26ba25
Message-id: <20180718225511.14878-2-jsnow@redhat.com>
26ba25
Patchwork-id: 81426
26ba25
O-Subject: [RHEL-7.6 qemu-kvm-rhev PATCH 01/35] block/dirty-bitmap: add lock to bdrv_enable/disable_dirty_bitmap
26ba25
Bugzilla: 1207657
26ba25
RH-Acked-by: Eric Blake <eblake@redhat.com>
26ba25
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
26ba25
RH-Acked-by: Fam Zheng <famz@redhat.com>
26ba25
26ba25
From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
26ba25
26ba25
Add locks and remove comments about BQL accordingly to
26ba25
dirty_bitmap_mutex definition in block_int.h.
26ba25
26ba25
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
26ba25
Signed-off-by: John Snow <jsnow@redhat.com>
26ba25
Reviewed-by: Jeff Cody <jcody@redhat.com>
26ba25
Message-id: 20180606182449.1607-2-jsnow@redhat.com
26ba25
Signed-off-by: John Snow <jsnow@redhat.com>
26ba25
(cherry picked from commit 8b1402ce80d74dc02802f101a0f6c340462380d1)
26ba25
Signed-off-by: John Snow <jsnow@redhat.com>
26ba25
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
26ba25
---
26ba25
 block/dirty-bitmap.c | 6 ++++--
26ba25
 1 file changed, 4 insertions(+), 2 deletions(-)
26ba25
26ba25
diff --git a/block/dirty-bitmap.c b/block/dirty-bitmap.c
26ba25
index 9671594..5623425 100644
26ba25
--- a/block/dirty-bitmap.c
26ba25
+++ b/block/dirty-bitmap.c
26ba25
@@ -442,18 +442,20 @@ void bdrv_remove_persistent_dirty_bitmap(BlockDriverState *bs,
26ba25
     }
26ba25
 }
26ba25
 
26ba25
-/* Called with BQL taken.  */
26ba25
 void bdrv_disable_dirty_bitmap(BdrvDirtyBitmap *bitmap)
26ba25
 {
26ba25
+    bdrv_dirty_bitmap_lock(bitmap);
26ba25
     assert(!bdrv_dirty_bitmap_frozen(bitmap));
26ba25
     bitmap->disabled = true;
26ba25
+    bdrv_dirty_bitmap_unlock(bitmap);
26ba25
 }
26ba25
 
26ba25
-/* Called with BQL taken.  */
26ba25
 void bdrv_enable_dirty_bitmap(BdrvDirtyBitmap *bitmap)
26ba25
 {
26ba25
+    bdrv_dirty_bitmap_lock(bitmap);
26ba25
     assert(!bdrv_dirty_bitmap_frozen(bitmap));
26ba25
     bitmap->disabled = false;
26ba25
+    bdrv_dirty_bitmap_unlock(bitmap);
26ba25
 }
26ba25
 
26ba25
 BlockDirtyInfoList *bdrv_query_dirty_bitmaps(BlockDriverState *bs)
26ba25
-- 
26ba25
1.8.3.1
26ba25