motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-18 23:52:14 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

qcow2: Move sync out of update_refcount

Browse source 
Note that the flush is omitted intentionally in qcow2_free_clusters. If
anything, we can leak clusters here if we lose the writes.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Kevin Wolf 2010-09-17 16:36:58 +02:00
parent c01828fb51
commit 1c4c28149f
1 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

13
block/qcow2-refcount.c
View file

@ -261,6 +261,8 @@ static int64_t alloc_refcount_block(BlockDriverState *bs, int64_t cluster_index)
goto fail_block; goto fail_block;
} }
bdrv_flush(bs->file);
/* Initialize the new refcount block only after updating its refcount, /* Initialize the new refcount block only after updating its refcount,
* update_refcount uses the refcount cache itself */ * update_refcount uses the refcount cache itself */
memset(s->refcount_block_cache, 0, s->cluster_size); memset(s->refcount_block_cache, 0, s->cluster_size);
@ -551,8 +553,6 @@ fail:
dummy = update_refcount(bs, offset, cluster_offset - offset, -addend); dummy = update_refcount(bs, offset, cluster_offset - offset, -addend);
} }
bdrv_flush(bs->file);
return ret; return ret;
} }
@ -575,6 +575,8 @@ static int update_cluster_refcount(BlockDriverState *bs,
return ret; return ret;
} }
bdrv_flush(bs->file);
return get_refcount(bs, cluster_index); return get_refcount(bs, cluster_index);
} }
@ -626,6 +628,9 @@ int64_t qcow2_alloc_clusters(BlockDriverState *bs, int64_t size)
if (ret < 0) { if (ret < 0) {
return ret; return ret;
} }
bdrv_flush(bs->file);
return offset; return offset;
} }
@ -803,6 +808,10 @@ int qcow2_update_snapshot_refcount(BlockDriverState *bs,
if (ret < 0) { if (ret < 0) {
goto fail; goto fail;
} }
/* TODO Flushing once for the whole function should
* be enough */
bdrv_flush(bs->file);
} }
/* compressed clusters are never modified */ /* compressed clusters are never modified */
refcount = 2; refcount = 2;