| Message ID | 20180706113630.25222-4-vsementsov@virtuozzo.com |
|---|---|
| State | New |
| Headers | show |
| Series | transaction support for bitmap merge | expand |
On 07/06/2018 07:36 AM, Vladimir Sementsov-Ogievskiy wrote: > Rename block-dirty-bitmap-clear transaction handlers to reuse them for > x-block-dirty-bitmap-merge transaction in the following patch. > > Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> > --- > blockdev.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/blockdev.c b/blockdev.c > index 9cb29ca63e..5348e8ba9b 100644 > --- a/blockdev.c > +++ b/blockdev.c > @@ -2026,7 +2026,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); > @@ -2036,7 +2036,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); > @@ -2170,8 +2170,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), > Reviewed-by: John Snow <jsnow@redhat.com>
diff --git a/blockdev.c b/blockdev.c index 9cb29ca63e..5348e8ba9b 100644 --- a/blockdev.c +++ b/blockdev.c @@ -2026,7 +2026,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); @@ -2036,7 +2036,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); @@ -2170,8 +2170,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),
Rename block-dirty-bitmap-clear transaction handlers to reuse them for x-block-dirty-bitmap-merge transaction in the following patch. Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> --- blockdev.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)