diff options
author | Anthony Liguori <aliguori@us.ibm.com> | 2010-10-11 17:08:39 -0500 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2010-10-11 17:08:39 -0500 |
commit | 5c0961618d5e8f92d85386cf110117e6ab5dd210 (patch) | |
tree | 11e5bd7a131daf27eb147c5bb733c40a0f588a31 /block/qcow2-cluster.c | |
parent | 472de0c851af86d26e3ccebf4154a27393091053 (diff) | |
parent | a3c4a01fb25a93d2b76d1fde1958ee616c152c5b (diff) | |
download | qemu-0.13.0-rc3.tar.gz |
Merge remote branch 'kwolf/for-stable-0.13' into stable-0.13v0.13.0-rc3
Diffstat (limited to 'block/qcow2-cluster.c')
-rw-r--r-- | block/qcow2-cluster.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c index 166922f8be..f562b1602e 100644 --- a/block/qcow2-cluster.c +++ b/block/qcow2-cluster.c @@ -655,7 +655,7 @@ static int write_l2_entries(BlockDriverState *bs, uint64_t *l2_table, int ret; BLKDBG_EVENT(bs->file, BLKDBG_L2_UPDATE); - ret = bdrv_pwrite_sync(bs->file, l2_offset + start_offset, + ret = bdrv_pwrite(bs->file, l2_offset + start_offset, &l2_table[l2_start_index], len); if (ret < 0) { return ret; @@ -718,9 +718,17 @@ int qcow2_alloc_cluster_link_l2(BlockDriverState *bs, QCowL2Meta *m) goto err; } - for (i = 0; i < j; i++) - qcow2_free_any_clusters(bs, - be64_to_cpu(old_cluster[i]) & ~QCOW_OFLAG_COPIED, 1); + /* + * If this was a COW, we need to decrease the refcount of the old cluster. + * Also flush bs->file to get the right order for L2 and refcount update. + */ + if (j != 0) { + bdrv_flush(bs->file); + for (i = 0; i < j; i++) { + qcow2_free_any_clusters(bs, + be64_to_cpu(old_cluster[i]) & ~QCOW_OFLAG_COPIED, 1); + } + } ret = 0; err: |