[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [STABLE 0.13][PATCH 10/13] qcow2: Remove unnecessary flush
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [STABLE 0.13][PATCH 10/13] qcow2: Remove unnecessary flush after L2 write |
Date: |
Mon, 13 Sep 2010 14:42:48 +0200 |
When a new cluster was allocated, we only need a flush after the write to the
L2 table if it was a COW and we need to decrease the refcounts of the old
clusters.
Signed-off-by: Kevin Wolf <address@hidden>
(cherry picked from commit 7ec5e6a4ca43494949465f9f9f3d9e4c7c620503)
---
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 166922f..f562b16 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:
--
1.7.2.2
- [Qemu-devel] [STABLE 0.13][PULL 00/13] Block fixes for stable-0.13, Kevin Wolf, 2010/09/13
- [Qemu-devel] [STABLE 0.13][PATCH 01/13] scsi-disk: fix the mode data length field returned by the MODE SENSE command, Kevin Wolf, 2010/09/13
- [Qemu-devel] [STABLE 0.13][PATCH 02/13] scsi-disk: fix the mode data header returned by the MODE SENSE(10) command, Kevin Wolf, 2010/09/13
- [Qemu-devel] [STABLE 0.13][PATCH 03/13] scsi-disk: respect the page control (PC) field in the MODE SENSE command, Kevin Wolf, 2010/09/13
- [Qemu-devel] [STABLE 0.13][PATCH 04/13] scsi-disk: fix the block descriptor returned by the MODE SENSE command, Kevin Wolf, 2010/09/13
- [Qemu-devel] [STABLE 0.13][PATCH 05/13] scsi-disk: return CHECK CONDITION for unknown page codes in the MODE SENSE command, Kevin Wolf, 2010/09/13
- [Qemu-devel] [STABLE 0.13][PATCH 07/13] raw-posix: Don't use file name for host_cdrom detection on Linux, Kevin Wolf, 2010/09/13
- [Qemu-devel] [STABLE 0.13][PATCH 06/13] scsi-disk: fix the check of the DBD bit in the MODE SENSE command, Kevin Wolf, 2010/09/13
- [Qemu-devel] [STABLE 0.13][PATCH 08/13] qemu-img convert: Use cache=unsafe for output image, Kevin Wolf, 2010/09/13
- [Qemu-devel] [STABLE 0.13][PATCH 09/13] block: Fix BDRV_O_CACHE_MASK, Kevin Wolf, 2010/09/13
- [Qemu-devel] [STABLE 0.13][PATCH 10/13] qcow2: Remove unnecessary flush after L2 write,
Kevin Wolf <=
- [Qemu-devel] [STABLE 0.13][PATCH 11/13] vvfat: Fix segfault on write to read-only disk, Kevin Wolf, 2010/09/13
- [Qemu-devel] [STABLE 0.13][PATCH 12/13] vvfat: Fix double free for opening the image rw, Kevin Wolf, 2010/09/13
- [Qemu-devel] [STABLE 0.13][PATCH 13/13] vvfat: Use cache=unsafe, Kevin Wolf, 2010/09/13