|
 |
7711c0 |
From 09fa15417e6c4778f50c8396004efd74077afa81 Mon Sep 17 00:00:00 2001
|
|
|
7711c0 |
From: John Snow <jsnow@redhat.com>
|
|
|
7711c0 |
Date: Wed, 6 Feb 2019 22:12:29 +0100
|
|
|
7711c0 |
Subject: [PATCH 19/33] blockdev: rename block-dirty-bitmap-clear transaction
|
|
|
7711c0 |
handlers
|
|
|
7711c0 |
|
|
|
7711c0 |
RH-Author: John Snow <jsnow@redhat.com>
|
|
|
7711c0 |
Message-id: <20190206221243.7407-10-jsnow@redhat.com>
|
|
|
7711c0 |
Patchwork-id: 84274
|
|
|
7711c0 |
O-Subject: [RHEL-7.7 qemu-kvm-rhev PATCH v2 09/23] blockdev: rename block-dirty-bitmap-clear transaction handlers
|
|
|
7711c0 |
Bugzilla: 1658343
|
|
|
7711c0 |
RH-Acked-by: Thomas Huth <thuth@redhat.com>
|
|
|
7711c0 |
RH-Acked-by: Laurent Vivier <lvivier@redhat.com>
|
|
|
7711c0 |
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
7711c0 |
|
|
|
7711c0 |
From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
|
|
|
7711c0 |
|
|
|
7711c0 |
Rename block-dirty-bitmap-clear transaction handlers to reuse them for
|
|
|
7711c0 |
x-block-dirty-bitmap-merge transaction in the following patch.
|
|
|
7711c0 |
|
|
|
7711c0 |
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
|
|
|
7711c0 |
Reviewed-by: John Snow <jsnow@redhat.com>
|
|
|
7711c0 |
(cherry picked from commit 5c4cf8b294ee65c049d6c40f5f6ff7c1befdb3d9)
|
|
|
7711c0 |
Signed-off-by: John Snow <jsnow@redhat.com>
|
|
|
7711c0 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
7711c0 |
---
|
|
|
7711c0 |
blockdev.c | 8 ++++----
|
|
|
7711c0 |
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
7711c0 |
|
|
|
7711c0 |
diff --git a/blockdev.c b/blockdev.c
|
|
|
7711c0 |
index 823a97f..853dd0e 100644
|
|
|
7711c0 |
--- a/blockdev.c
|
|
|
7711c0 |
+++ b/blockdev.c
|
|
|
7711c0 |
@@ -2178,7 +2178,7 @@ static void block_dirty_bitmap_clear_prepare(BlkActionState *common,
|
|
|
7711c0 |
bdrv_clear_dirty_bitmap(state->bitmap, &state->backup);
|
|
|
7711c0 |
}
|
|
|
7711c0 |
|
|
|
7711c0 |
-static void block_dirty_bitmap_clear_abort(BlkActionState *common)
|
|
|
7711c0 |
+static void block_dirty_bitmap_restore(BlkActionState *common)
|
|
|
7711c0 |
{
|
|
|
7711c0 |
BlockDirtyBitmapState *state = DO_UPCAST(BlockDirtyBitmapState,
|
|
|
7711c0 |
common, common);
|
|
|
7711c0 |
@@ -2188,7 +2188,7 @@ static void block_dirty_bitmap_clear_abort(BlkActionState *common)
|
|
|
7711c0 |
}
|
|
|
7711c0 |
}
|
|
|
7711c0 |
|
|
|
7711c0 |
-static void block_dirty_bitmap_clear_commit(BlkActionState *common)
|
|
|
7711c0 |
+static void block_dirty_bitmap_free_backup(BlkActionState *common)
|
|
|
7711c0 |
{
|
|
|
7711c0 |
BlockDirtyBitmapState *state = DO_UPCAST(BlockDirtyBitmapState,
|
|
|
7711c0 |
common, common);
|
|
|
7711c0 |
@@ -2322,8 +2322,8 @@ static const BlkActionOps actions[] = {
|
|
|
7711c0 |
[TRANSACTION_ACTION_KIND_BLOCK_DIRTY_BITMAP_CLEAR] = {
|
|
|
7711c0 |
.instance_size = sizeof(BlockDirtyBitmapState),
|
|
|
7711c0 |
.prepare = block_dirty_bitmap_clear_prepare,
|
|
|
7711c0 |
- .commit = block_dirty_bitmap_clear_commit,
|
|
|
7711c0 |
- .abort = block_dirty_bitmap_clear_abort,
|
|
|
7711c0 |
+ .commit = block_dirty_bitmap_free_backup,
|
|
|
7711c0 |
+ .abort = block_dirty_bitmap_restore,
|
|
|
7711c0 |
},
|
|
|
7711c0 |
[TRANSACTION_ACTION_KIND_X_BLOCK_DIRTY_BITMAP_ENABLE] = {
|
|
|
7711c0 |
.instance_size = sizeof(BlockDirtyBitmapState),
|
|
|
7711c0 |
--
|
|
|
7711c0 |
1.8.3.1
|
|
|
7711c0 |
|