[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 08/13] qcow2: flush refcount cache correctly in allo
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH 08/13] qcow2: flush refcount cache correctly in alloc_refcount_block() |
Date: |
Tue, 12 Mar 2013 15:41:14 +0100 |
From: Stefan Hajnoczi <address@hidden>
update_refcount() affects the refcount cache, it does not write to disk.
Therefore bdrv_flush(bs->file) does nothing. We need to flush the
refcount cache in order to write out the refcount updates!
While we're here also add error returns when qcow2_cache_flush() fails.
Signed-off-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
block/qcow2-refcount.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c
index 55543ed..e8b5d0a 100644
--- a/block/qcow2-refcount.c
+++ b/block/qcow2-refcount.c
@@ -201,7 +201,10 @@ static int alloc_refcount_block(BlockDriverState *bs,
*refcount_block = NULL;
/* We write to the refcount table, so we might depend on L2 tables */
- qcow2_cache_flush(bs, s->l2_table_cache);
+ ret = qcow2_cache_flush(bs, s->l2_table_cache);
+ if (ret < 0) {
+ return ret;
+ }
/* Allocate the refcount block itself and mark it as used */
int64_t new_block = alloc_clusters_noref(bs, s->cluster_size);
@@ -237,7 +240,10 @@ static int alloc_refcount_block(BlockDriverState *bs,
goto fail_block;
}
- bdrv_flush(bs->file);
+ ret = qcow2_cache_flush(bs, s->refcount_block_cache);
+ if (ret < 0) {
+ goto fail_block;
+ }
/* Initialize the new refcount block only after updating its refcount,
* update_refcount uses the refcount cache itself */
--
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 <=
- [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, 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