Commit 56bd6624 authored by Vladimir Sementsov-Ogievskiy's avatar Vladimir Sementsov-Ogievskiy Committed by John Snow
Browse files

dirty-bitmap: rename bdrv_undo_clear_dirty_bitmap 



Use more generic names to reuse the function for bitmap merge in the
following commit.

Signed-off-by: default avatarVladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: default avatarJohn Snow <jsnow@redhat.com>
parent 06bf5006

block/dirty-bitmap.c

+2 −2
Original line number Diff line number Diff line
@@ -633,12 +633,12 @@ void bdrv_clear_dirty_bitmap(BdrvDirtyBitmap *bitmap, HBitmap **out) 
    bdrv_dirty_bitmap_unlock(bitmap);

}



void bdrv_undo_clear_dirty_bitmap(BdrvDirtyBitmap *bitmap, HBitmap *in)

void bdrv_restore_dirty_bitmap(BdrvDirtyBitmap *bitmap, HBitmap *backup)

{

    HBitmap *tmp = bitmap->bitmap;

    assert(bdrv_dirty_bitmap_enabled(bitmap));

    assert(!bdrv_dirty_bitmap_readonly(bitmap));

    bitmap->bitmap = in;

    bitmap->bitmap = backup;

    hbitmap_free(tmp);

}

blockdev.c

+1 −1
Original line number Diff line number Diff line
@@ -2033,7 +2033,7 @@ static void block_dirty_bitmap_clear_abort(BlkActionState *common) 
                                             common, common);



    if (state->backup) {

        bdrv_undo_clear_dirty_bitmap(state->bitmap, state->backup);

        bdrv_restore_dirty_bitmap(state->bitmap, state->backup);

    }

}

include/block/block_int.h

+1 −1
Original line number Diff line number Diff line
@@ -1155,7 +1155,7 @@ bool blk_dev_is_medium_locked(BlockBackend *blk); 
void bdrv_set_dirty(BlockDriverState *bs, int64_t offset, int64_t bytes);



void bdrv_clear_dirty_bitmap(BdrvDirtyBitmap *bitmap, HBitmap **out);

void bdrv_undo_clear_dirty_bitmap(BdrvDirtyBitmap *bitmap, HBitmap *in);

void bdrv_restore_dirty_bitmap(BdrvDirtyBitmap *bitmap, HBitmap *backup);



void bdrv_inc_in_flight(BlockDriverState *bs);

void bdrv_dec_in_flight(BlockDriverState *bs);