Commit 637d54a5 authored by Max Reitz's avatar Max Reitz Committed by Kevin Wolf
Browse files

block: Keep subtree drained in drop_intermediate 



bdrv_drop_intermediate() calls BdrvChildRole.update_filename().  That
may poll, thus changing the graph, which potentially breaks the
QLIST_FOREACH_SAFE() loop.

Just keep the whole subtree drained.  This is probably the right thing
to do anyway (dropping nodes while the subtree is not drained seems
wrong).

Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
Reviewed-by: default avatarKevin Wolf <kwolf@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent e444fa83

block.c

+2 −0
Original line number Diff line number Diff line
@@ -4491,6 +4491,7 @@ int bdrv_drop_intermediate(BlockDriverState *top, BlockDriverState *base, 
    int ret = -EIO;



    bdrv_ref(top);

    bdrv_subtree_drained_begin(top);



    if (!top->drv || !base->drv) {

        goto exit;
@@ -4562,6 +4563,7 @@ int bdrv_drop_intermediate(BlockDriverState *top, BlockDriverState *base, 


    ret = 0;

exit:

    bdrv_subtree_drained_end(top);

    bdrv_unref(top);

    return ret;

}