[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 25/25] qcow2: Remove unnecessary flush after L2 writ
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH 25/25] qcow2: Remove unnecessary flush after L2 write |
Date: |
Wed, 8 Sep 2010 15:29:42 +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>
---
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] [PULL v2 00/25] Block patches, Kevin Wolf, 2010/09/08
- [Qemu-devel] [PATCH 06/25] vvfat: fat_chksum(): fix access above array bounds, Kevin Wolf, 2010/09/08
- [Qemu-devel] [PATCH 17/25] scsi: fix and improve debug prints, Kevin Wolf, 2010/09/08
- [Qemu-devel] [PATCH 15/25] scsi-disk: return CHECK CONDITION for unknown page codes in the MODE SENSE command, Kevin Wolf, 2010/09/08
- [Qemu-devel] [PATCH 22/25] raw-posix: improve detection of scsi-generic devices, Kevin Wolf, 2010/09/08
- [Qemu-devel] [PATCH 25/25] qcow2: Remove unnecessary flush after L2 write,
Kevin Wolf <=
- [Qemu-devel] [PATCH 14/25] scsi-disk: fix the block descriptor returned by the MODE SENSE command, Kevin Wolf, 2010/09/08
- [Qemu-devel] [PATCH 18/25] qemu-io: Make alloc output useful when nb_sectors=1, Kevin Wolf, 2010/09/08
- [Qemu-devel] [PATCH 02/25] virtio-blk: Fix migration of queued requests, Kevin Wolf, 2010/09/08
- [Qemu-devel] [PATCH 05/25] qemu-img rebase: Open new backing file read-only, Kevin Wolf, 2010/09/08
- [Qemu-devel] [PATCH 24/25] block: Fix BDRV_O_CACHE_MASK, Kevin Wolf, 2010/09/08
- [Qemu-devel] [PATCH 20/25] Improve ATA IDENTIFY word 64 contents., Kevin Wolf, 2010/09/08
- [Qemu-devel] [PATCH 23/25] qemu-img convert: Use cache=unsafe for output image, Kevin Wolf, 2010/09/08
- [Qemu-devel] [PATCH 21/25] scsi-disk: add some optional scsi commands, Kevin Wolf, 2010/09/08
- [Qemu-devel] [PATCH 07/25] nbd: Introduce NBD named exports., Kevin Wolf, 2010/09/08
- [Qemu-devel] [PATCH 19/25] raw-posix: Don't use file name for host_cdrom detection on Linux, Kevin Wolf, 2010/09/08