david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

block: fix cache flushing in bdrv_commit

Browse Source 
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Christoph Hellwig 2010-01-17 12:32:30 +01:00 committed by Anthony Liguori
parent 23fabed136
commit 1d44952fc7
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
block.c
View File

@ -557,6 +557,7 @@ int bdrv_commit(BlockDriverState *bs)
BlockDriver *drv = bs->drv; BlockDriver *drv = bs->drv;
int64_t i, total_sectors; int64_t i, total_sectors;
int n, j; int n, j;
int ret = 0;
unsigned char sector[512]; unsigned char sector[512];
if (!drv) if (!drv)
@ -588,8 +589,10 @@ int bdrv_commit(BlockDriverState *bs)
} }
} }
if (drv->bdrv_make_empty) if (drv->bdrv_make_empty) {
return drv->bdrv_make_empty(bs); ret = drv->bdrv_make_empty(bs);
bdrv_flush(bs);
}
/* /*
* Make sure all data we wrote to the backing device is actually * 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) if (bs->backing_hd)
bdrv_flush(bs->backing_hd); bdrv_flush(bs->backing_hd);
return 0; return ret;
} }
/* /*