mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

block: Invalidate all children

Browse Source 
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: Fam Zheng <famz@redhat.com>
Reviewed-by: Alberto Garcia <berto@igalia.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Fam Zheng 2016-05-11 10:45:33 +08:00 committed by Kevin Wolf
parent 52a4650574
commit 0d1c5c9160
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
block.c
View File

@ -3198,6 +3198,7 @@ void bdrv_init_with_whitelist(void)
void bdrv_invalidate_cache(BlockDriverState *bs, Error **errp) void bdrv_invalidate_cache(BlockDriverState *bs, Error **errp)
{ {
BdrvChild *child;
Error *local_err = NULL; Error *local_err = NULL;
int ret; int ret;
@ -3212,13 +3213,20 @@ void bdrv_invalidate_cache(BlockDriverState *bs, Error **errp)
if (bs->drv->bdrv_invalidate_cache) { if (bs->drv->bdrv_invalidate_cache) {
bs->drv->bdrv_invalidate_cache(bs, &local_err); bs->drv->bdrv_invalidate_cache(bs, &local_err);
} else if (bs->file) { if (local_err) {
bdrv_invalidate_cache(bs->file->bs, &local_err); bs->open_flags |= BDRV_O_INACTIVE;
error_propagate(errp, local_err);
return;
}
} }
if (local_err) {
bs->open_flags |= BDRV_O_INACTIVE; QLIST_FOREACH(child, &bs->children, next) {
error_propagate(errp, local_err); bdrv_invalidate_cache(child->bs, &local_err);
return; if (local_err) {
bs->open_flags |= BDRV_O_INACTIVE;
error_propagate(errp, local_err);
return;
}
} }
ret = refresh_total_sectors(bs, bs->total_sectors); ret = refresh_total_sectors(bs, bs->total_sectors);