Commit 5016f21b authored by Stefan Hajnoczi's avatar Stefan Hajnoczi
Browse files

block: drop unused BlockDirtyBitmapState->aio_context field 



The dirty bitmap actions in qmp_transaction have not used AioContext
since the dirty bitmap locking discipline was introduced in commit
2119882c ("block: introduce
dirty_bitmap_mutex").  Remove the unused field.

Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: default avatarKevin Wolf <kwolf@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Message-id: 20171206144550.22295-7-stefanha@redhat.com
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent a36e458c

blockdev.c

+0 −13
Original line number Diff line number Diff line
@@ -2049,7 +2049,6 @@ typedef struct BlockDirtyBitmapState { 
    BlkActionState common;

    BdrvDirtyBitmap *bitmap;

    BlockDriverState *bs;

    AioContext *aio_context;

    HBitmap *backup;

    bool prepared;

} BlockDirtyBitmapState;
@@ -2128,7 +2127,6 @@ static void block_dirty_bitmap_clear_prepare(BlkActionState *common, 
    }



    bdrv_clear_dirty_bitmap(state->bitmap, &state->backup);

    /* AioContext is released in .clean() */

}



static void block_dirty_bitmap_clear_abort(BlkActionState *common)
@@ -2149,16 +2147,6 @@ static void block_dirty_bitmap_clear_commit(BlkActionState *common) 
    hbitmap_free(state->backup);

}



static void block_dirty_bitmap_clear_clean(BlkActionState *common)

{

    BlockDirtyBitmapState *state = DO_UPCAST(BlockDirtyBitmapState,

                                             common, common);



    if (state->aio_context) {

        aio_context_release(state->aio_context);

    }

}



static void abort_prepare(BlkActionState *common, Error **errp)

{

    error_setg(errp, "Transaction aborted using Abort action");
@@ -2219,7 +2207,6 @@ static const BlkActionOps actions[] = { 
        .prepare = block_dirty_bitmap_clear_prepare,

        .commit = block_dirty_bitmap_clear_commit,

        .abort = block_dirty_bitmap_clear_abort,

        .clean = block_dirty_bitmap_clear_clean,

    }

};