|
@@ -2027,7 +2027,7 @@ static void block_dirty_bitmap_clear_prepare(BlkActionState *common,
|
|
|
bdrv_clear_dirty_bitmap(state->bitmap, &state->backup);
|
|
|
}
|
|
|
|
|
|
-static void block_dirty_bitmap_clear_abort(BlkActionState *common)
|
|
|
+static void block_dirty_bitmap_restore(BlkActionState *common)
|
|
|
{
|
|
|
BlockDirtyBitmapState *state = DO_UPCAST(BlockDirtyBitmapState,
|
|
|
common, common);
|
|
@@ -2037,7 +2037,7 @@ static void block_dirty_bitmap_clear_abort(BlkActionState *common)
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-static void block_dirty_bitmap_clear_commit(BlkActionState *common)
|
|
|
+static void block_dirty_bitmap_free_backup(BlkActionState *common)
|
|
|
{
|
|
|
BlockDirtyBitmapState *state = DO_UPCAST(BlockDirtyBitmapState,
|
|
|
common, common);
|
|
@@ -2171,8 +2171,8 @@ static const BlkActionOps actions[] = {
|
|
|
[TRANSACTION_ACTION_KIND_BLOCK_DIRTY_BITMAP_CLEAR] = {
|
|
|
.instance_size = sizeof(BlockDirtyBitmapState),
|
|
|
.prepare = block_dirty_bitmap_clear_prepare,
|
|
|
- .commit = block_dirty_bitmap_clear_commit,
|
|
|
- .abort = block_dirty_bitmap_clear_abort,
|
|
|
+ .commit = block_dirty_bitmap_free_backup,
|
|
|
+ .abort = block_dirty_bitmap_restore,
|
|
|
},
|
|
|
[TRANSACTION_ACTION_KIND_X_BLOCK_DIRTY_BITMAP_ENABLE] = {
|
|
|
.instance_size = sizeof(BlockDirtyBitmapState),
|