[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 11/19] qcow2: Fix bdrv_write_compressed error handli
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH 11/19] qcow2: Fix bdrv_write_compressed error handling |
Date: |
Fri, 21 Oct 2011 19:19:08 +0200 |
If during allocation of compressed clusters the cluster was already allocated
uncompressed, fail and properly release the l2_table (the latter avoids a
failed assertion).
While at it, make it return some real error numbers instead of -1.
Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Dong Xu Wang <address@hidden>
---
block/qcow2-cluster.c | 6 ++++--
block/qcow2.c | 29 ++++++++++++++++++-----------
2 files changed, 22 insertions(+), 13 deletions(-)
diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c
index 2f76311..f4e049f 100644
--- a/block/qcow2-cluster.c
+++ b/block/qcow2-cluster.c
@@ -568,8 +568,10 @@ uint64_t
qcow2_alloc_compressed_cluster_offset(BlockDriverState *bs,
}
cluster_offset = be64_to_cpu(l2_table[l2_index]);
- if (cluster_offset & QCOW_OFLAG_COPIED)
- return cluster_offset & ~QCOW_OFLAG_COPIED;
+ if (cluster_offset & QCOW_OFLAG_COPIED) {
+ qcow2_cache_put(bs, s->l2_table_cache, (void**) &l2_table);
+ return 0;
+ }
if (cluster_offset)
qcow2_free_any_clusters(bs, cluster_offset, 1);
diff --git a/block/qcow2.c b/block/qcow2.c
index 4dc980c..91f4f04 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -1053,8 +1053,8 @@ static int qcow2_write_compressed(BlockDriverState *bs,
int64_t sector_num,
Z_DEFLATED, -12,
9, Z_DEFAULT_STRATEGY);
if (ret != 0) {
- g_free(out_buf);
- return -1;
+ ret = -EINVAL;
+ goto fail;
}
strm.avail_in = s->cluster_size;
@@ -1064,9 +1064,9 @@ static int qcow2_write_compressed(BlockDriverState *bs,
int64_t sector_num,
ret = deflate(&strm, Z_FINISH);
if (ret != Z_STREAM_END && ret != Z_OK) {
- g_free(out_buf);
deflateEnd(&strm);
- return -1;
+ ret = -EINVAL;
+ goto fail;
}
out_len = strm.next_out - out_buf;
@@ -1074,22 +1074,29 @@ static int qcow2_write_compressed(BlockDriverState *bs,
int64_t sector_num,
if (ret != Z_STREAM_END || out_len >= s->cluster_size) {
/* could not compress: write normal cluster */
- bdrv_write(bs, sector_num, buf, s->cluster_sectors);
+ ret = bdrv_write(bs, sector_num, buf, s->cluster_sectors);
+ if (ret < 0) {
+ goto fail;
+ }
} else {
cluster_offset = qcow2_alloc_compressed_cluster_offset(bs,
sector_num << 9, out_len);
- if (!cluster_offset)
- return -1;
+ if (!cluster_offset) {
+ ret = -EIO;
+ goto fail;
+ }
cluster_offset &= s->cluster_offset_mask;
BLKDBG_EVENT(bs->file, BLKDBG_WRITE_COMPRESSED);
- if (bdrv_pwrite(bs->file, cluster_offset, out_buf, out_len) !=
out_len) {
- g_free(out_buf);
- return -1;
+ ret = bdrv_pwrite(bs->file, cluster_offset, out_buf, out_len);
+ if (ret < 0) {
+ goto fail;
}
}
+ ret = 0;
+fail:
g_free(out_buf);
- return 0;
+ return ret;
}
static BlockDriverAIOCB *qcow2_aio_flush(BlockDriverState *bs,
--
1.7.6.4
- [Qemu-devel] [PULL 00/19] Block patches, Kevin Wolf, 2011/10/21
- [Qemu-devel] [PATCH 01/19] sheepdog: add coroutine_fn markers, Kevin Wolf, 2011/10/21
- [Qemu-devel] [PATCH 02/19] add socket_set_block, Kevin Wolf, 2011/10/21
- [Qemu-devel] [PATCH 03/19] block: rename bdrv_co_rw_bh, Kevin Wolf, 2011/10/21
- [Qemu-devel] [PATCH 04/19] fix memory leak in aio_write_f, Kevin Wolf, 2011/10/21
- [Qemu-devel] [PATCH 05/19] xen_disk: Always set feature-barrier = 1, Kevin Wolf, 2011/10/21
- [Qemu-devel] [PATCH 08/19] block: add bdrv_co_discard and bdrv_aio_discard support, Kevin Wolf, 2011/10/21
- [Qemu-devel] [PATCH 06/19] block: unify flush implementations, Kevin Wolf, 2011/10/21
- [Qemu-devel] [PATCH 10/19] qemu-img: Don't allow preallocation and compression at the same time, Kevin Wolf, 2011/10/21
- [Qemu-devel] [PATCH 09/19] fdc: Fix floppy port I/O, Kevin Wolf, 2011/10/21
- [Qemu-devel] [PATCH 11/19] qcow2: Fix bdrv_write_compressed error handling,
Kevin Wolf <=
- [Qemu-devel] [PATCH 07/19] block: drop redundant bdrv_flush implementation, Kevin Wolf, 2011/10/21
- [Qemu-devel] [PATCH 12/19] pc: Fix floppy drives with if=none, Kevin Wolf, 2011/10/21
- [Qemu-devel] [PATCH 17/19] block: take lock around bdrv_write implementations, Kevin Wolf, 2011/10/21
- [Qemu-devel] [PATCH 14/19] vmdk: clean up open, Kevin Wolf, 2011/10/21
- [Qemu-devel] [PATCH 16/19] block: take lock around bdrv_read implementations, Kevin Wolf, 2011/10/21
- [Qemu-devel] [PATCH 13/19] vmdk: fix return values of vmdk_parent_open, Kevin Wolf, 2011/10/21
- [Qemu-devel] [PATCH 18/19] block: change flush to co_flush, Kevin Wolf, 2011/10/21
- [Qemu-devel] [PATCH 15/19] block: add a CoMutex to synchronous read drivers, Kevin Wolf, 2011/10/21
- [Qemu-devel] [PATCH 19/19] block: change discard to co_discard, Kevin Wolf, 2011/10/21
- Re: [Qemu-devel] [PULL 00/19] Block patches, Anthony Liguori, 2011/10/24