Commit 1d44952f authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Anthony Liguori
Browse files

block: fix cache flushing in bdrv_commit 



Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parent 23fabed1

block.c

+6 −3
Original line number Diff line number Diff line
@@ -557,6 +557,7 @@ int bdrv_commit(BlockDriverState *bs) 
    BlockDriver *drv = bs->drv;

    int64_t i, total_sectors;

    int n, j;

    int ret = 0;

    unsigned char sector[512];



    if (!drv)
@@ -588,8 +589,10 @@ int bdrv_commit(BlockDriverState *bs) 
        }

    }



    if (drv->bdrv_make_empty)

	return drv->bdrv_make_empty(bs);

    if (drv->bdrv_make_empty) {

        ret = drv->bdrv_make_empty(bs);

        bdrv_flush(bs);

    }



    /*

     * Make sure all data we wrote to the backing device is actually
@@ -597,7 +600,7 @@ int bdrv_commit(BlockDriverState *bs) 
     */

    if (bs->backing_hd)

        bdrv_flush(bs->backing_hd);

    return 0;

    return ret;

}



/*