[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 11/13] qcow2: flush in qcow2_update_snapshot_refcoun
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH 11/13] qcow2: flush in qcow2_update_snapshot_refcount() |
Date: |
Tue, 12 Mar 2013 15:41:17 +0100 |
From: Stefan Hajnoczi <address@hidden>
Users of qcow2_update_snapshot_refcount() do not flush consistently.
qcow2_snapshot_create() flushes but qcow2_snapshot_goto() and
qcow2_snapshot_delete() do not.
Solve this by moving the bdrv_flush() into
qcow2_update_snapshot_refcount().
Signed-off-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
block/qcow2-refcount.c | 2 +-
block/qcow2-snapshot.c | 5 -----
2 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c
index 4d9df5f..3d29d30 100644
--- a/block/qcow2-refcount.c
+++ b/block/qcow2-refcount.c
@@ -851,7 +851,7 @@ int qcow2_update_snapshot_refcount(BlockDriverState *bs,
}
}
- ret = 0;
+ ret = bdrv_flush(bs);
fail:
if (l2_table) {
qcow2_cache_put(bs, s->l2_table_cache, (void**) &l2_table);
diff --git a/block/qcow2-snapshot.c b/block/qcow2-snapshot.c
index f4719d9..992a5c8 100644
--- a/block/qcow2-snapshot.c
+++ b/block/qcow2-snapshot.c
@@ -381,11 +381,6 @@ int qcow2_snapshot_create(BlockDriverState *bs,
QEMUSnapshotInfo *sn_info)
goto fail;
}
- ret = bdrv_flush(bs);
- if (ret < 0) {
- goto fail;
- }
-
/* Append the new snapshot to the snapshot list */
new_snapshot_list = g_malloc((s->nb_snapshots + 1) * sizeof(QCowSnapshot));
if (s->snapshots) {
--
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, 2013/03/12
- [Qemu-devel] [PATCH 11/13] qcow2: flush in qcow2_update_snapshot_refcount(),
Kevin Wolf <=
- [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