[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 09/13] qcow2: flush refcount cache correctly in qcow
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH 09/13] qcow2: flush refcount cache correctly in qcow2_write_snapshots() |
Date: |
Tue, 12 Mar 2013 15:41:15 +0100 |
From: Stefan Hajnoczi <address@hidden>
Since qcow2 metadata is cached we need to flush the caches, not just the
underlying file. Use bdrv_flush(bs) instead of bdrv_flush(bs->file).
Also add the error return path when bdrv_flush() fails and move the
flush after checking for qcow2_alloc_clusters() failure so that the
qcow2_alloc_clusters() error return value takes precedence.
Signed-off-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
block/qcow2-snapshot.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/block/qcow2-snapshot.c b/block/qcow2-snapshot.c
index eb8fcd5..f4719d9 100644
--- a/block/qcow2-snapshot.c
+++ b/block/qcow2-snapshot.c
@@ -180,11 +180,14 @@ static int qcow2_write_snapshots(BlockDriverState *bs)
/* Allocate space for the new snapshot list */
snapshots_offset = qcow2_alloc_clusters(bs, snapshots_size);
- bdrv_flush(bs->file);
offset = snapshots_offset;
if (offset < 0) {
return offset;
}
+ ret = bdrv_flush(bs);
+ if (ret < 0) {
+ return ret;
+ }
/* Write all snapshots to the new list */
for(i = 0; i < s->nb_snapshots; i++) {
--
1.8.1.4
- [Qemu-devel] [PULL 00/13] Block patches, Kevin Wolf, 2013/03/12
- [Qemu-devel] [PATCH 04/13] block: Add options QDict to bdrv_open_common(), Kevin Wolf, 2013/03/12
- [Qemu-devel] [PATCH 01/13] block: Add options QDict to .bdrv_open(), Kevin Wolf, 2013/03/12
- [Qemu-devel] [PATCH 02/13] block: Add options QDict to bdrv_open() prototype, Kevin Wolf, 2013/03/12
- [Qemu-devel] [PATCH 08/13] qcow2: flush refcount cache correctly in alloc_refcount_block(), Kevin Wolf, 2013/03/12
- [Qemu-devel] [PATCH 06/13] block: Support driver specific options in drive_init(), Kevin Wolf, 2013/03/12
- [Qemu-devel] [PATCH 03/13] Add qdict_clone_shallow(), Kevin Wolf, 2013/03/12
- [Qemu-devel] [PATCH 05/13] qemu-option: Add qemu_opts_absorb_qdict(), Kevin Wolf, 2013/03/12
- [Qemu-devel] [PATCH 09/13] qcow2: flush refcount cache correctly in qcow2_write_snapshots(),
Kevin Wolf <=
- [Qemu-devel] [PATCH 11/13] qcow2: flush in qcow2_update_snapshot_refcount(), Kevin Wolf, 2013/03/12
- [Qemu-devel] [PATCH 10/13] qcow2: set L2 cache dependency in qcow2_alloc_bytes(), Kevin Wolf, 2013/03/12
- [Qemu-devel] [PATCH 07/13] qcow2: Allow lazy refcounts to be enabled on the command line, Kevin Wolf, 2013/03/12
- [Qemu-devel] [PATCH 12/13] qcow2: drop flush in update_cluster_refcount(), Kevin Wolf, 2013/03/12
- [Qemu-devel] [PATCH 13/13] qcow2: drop unnecessary flush in qcow2_update_snapshot_refcount(), Kevin Wolf, 2013/03/12