Commit c9e9e9c6 authored by Fam Zheng's avatar Fam Zheng Committed by Kevin Wolf
Browse files

block: Drop superfluous invalidating bs->file from drivers 



Now they are invalidated by the block layer, so it's not necessary to
do this in block drivers' implementations of .bdrv_invalidate_cache.

Signed-off-by: default avatarFam Zheng <famz@redhat.com>
Reviewed-by: default avatarAlberto Garcia <berto@igalia.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent 0d1c5c91

block/qcow2.c

+0 −7
Original line number Diff line number Diff line
@@ -1757,13 +1757,6 @@ static void qcow2_invalidate_cache(BlockDriverState *bs, Error **errp) 


    qcow2_close(bs);



    bdrv_invalidate_cache(bs->file->bs, &local_err);

    if (local_err) {

        error_propagate(errp, local_err);

        bs->drv = NULL;

        return;

    }



    memset(s, 0, sizeof(BDRVQcow2State));

    options = qdict_clone_shallow(bs->options);

block/qed.c

+0 −6
Original line number Diff line number Diff line
@@ -1594,12 +1594,6 @@ static void bdrv_qed_invalidate_cache(BlockDriverState *bs, Error **errp) 


    bdrv_qed_close(bs);



    bdrv_invalidate_cache(bs->file->bs, &local_err);

    if (local_err) {

        error_propagate(errp, local_err);

        return;

    }



    memset(s, 0, sizeof(BDRVQEDState));

    ret = bdrv_qed_open(bs, NULL, bs->open_flags, &local_err);

    if (local_err) {

block/quorum.c

+0 −16
Original line number Diff line number Diff line
@@ -747,21 +747,6 @@ static int64_t quorum_getlength(BlockDriverState *bs) 
    return result;

}



static void quorum_invalidate_cache(BlockDriverState *bs, Error **errp)

{

    BDRVQuorumState *s = bs->opaque;

    Error *local_err = NULL;

    int i;



    for (i = 0; i < s->num_children; i++) {

        bdrv_invalidate_cache(s->children[i]->bs, &local_err);

        if (local_err) {

            error_propagate(errp, local_err);

            return;

        }

    }

}



static coroutine_fn int quorum_co_flush(BlockDriverState *bs)

{

    BDRVQuorumState *s = bs->opaque;
@@ -1070,7 +1055,6 @@ static BlockDriver bdrv_quorum = { 


    .bdrv_aio_readv                     = quorum_aio_readv,

    .bdrv_aio_writev                    = quorum_aio_writev,

    .bdrv_invalidate_cache              = quorum_invalidate_cache,



    .bdrv_detach_aio_context            = quorum_detach_aio_context,

    .bdrv_attach_aio_context            = quorum_attach_aio_context,