Commit 9a7dedbc authored by Kevin Wolf's avatar Kevin Wolf
Browse files

block: Reorder cleanups in bdrv_close() 



Block drivers may still want to access their child nodes in their
.bdrv_close handler. If they unref and/or detach a child by themselves,
this should not result in a double free.

There is additional code for backing files, which are just a special
case of child nodes. The same applies for them.

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

block.c

+8 −6
Original line number Diff line number Diff line
@@ -1901,6 +1901,14 @@ void bdrv_close(BlockDriverState *bs) 
    if (bs->drv) {

        BdrvChild *child, *next;



        bs->drv->bdrv_close(bs);



        if (bs->backing_hd) {

            BlockDriverState *backing_hd = bs->backing_hd;

            bdrv_set_backing_hd(bs, NULL);

            bdrv_unref(backing_hd);

        }



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

            /* TODO Remove bdrv_unref() from drivers' close function and use

             * bdrv_unref_child() here */
@@ -1910,12 +1918,6 @@ void bdrv_close(BlockDriverState *bs) 
            bdrv_detach_child(child);

        }



        if (bs->backing_hd) {

            BlockDriverState *backing_hd = bs->backing_hd;

            bdrv_set_backing_hd(bs, NULL);

            bdrv_unref(backing_hd);

        }

        bs->drv->bdrv_close(bs);

        g_free(bs->opaque);

        bs->opaque = NULL;

        bs->drv = NULL;