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

block: Invalidate all children 



Currently we only recurse to bs->file, which will miss the children in quorum
and VMDK.

Recurse into the whole subtree to avoid that.

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 52a46505

block.c

+14 −6
Original line number Diff line number Diff line
@@ -3198,6 +3198,7 @@ void bdrv_init_with_whitelist(void) 


void bdrv_invalidate_cache(BlockDriverState *bs, Error **errp)

{

    BdrvChild *child;

    Error *local_err = NULL;

    int ret;
@@ -3212,14 +3213,21 @@ void bdrv_invalidate_cache(BlockDriverState *bs, Error **errp) 


    if (bs->drv->bdrv_invalidate_cache) {

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

    } else if (bs->file) {

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

        if (local_err) {

            bs->open_flags |= BDRV_O_INACTIVE;

            error_propagate(errp, local_err);

            return;

        }

    }



    QLIST_FOREACH(child, &bs->children, next) {

        bdrv_invalidate_cache(child->bs, &local_err);

        if (local_err) {

            bs->open_flags |= BDRV_O_INACTIVE;

            error_propagate(errp, local_err);

            return;

        }

    }



    ret = refresh_total_sectors(bs, bs->total_sectors);

    if (ret < 0) {