[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 27/30] qcow2: Free only newly allocated clusters on e
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PULL 27/30] qcow2: Free only newly allocated clusters on error |
Date: |
Fri, 27 Sep 2013 17:39:27 +0200 |
From: Max Reitz <address@hidden>
In expand_zero_clusters_in_l1, a new cluster is only allocated if it was
not already preallocated. On error, such preallocated clusters should
not be freed, but only the newly allocated ones.
Signed-off-by: Max Reitz <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
block/qcow2-cluster.c | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c
index c743db1..91d07f2 100644
--- a/block/qcow2-cluster.c
+++ b/block/qcow2-cluster.c
@@ -1554,6 +1554,7 @@ static int expand_zero_clusters_in_l1(BlockDriverState
*bs, uint64_t *l1_table,
uint64_t l2_entry = be64_to_cpu(l2_table[j]);
int64_t offset = l2_entry & L2E_OFFSET_MASK, cluster_index;
int cluster_type = qcow2_get_cluster_type(l2_entry);
+ bool preallocated = offset != 0;
if (cluster_type == QCOW2_CLUSTER_NORMAL) {
cluster_index = offset >> s->cluster_bits;
@@ -1579,8 +1580,7 @@ static int expand_zero_clusters_in_l1(BlockDriverState
*bs, uint64_t *l1_table,
continue;
}
- if (!offset) {
- /* not preallocated */
+ if (!preallocated) {
if (!bs->backing_hd) {
/* not backed; therefore we can simply deallocate the
* cluster */
@@ -1599,16 +1599,20 @@ static int expand_zero_clusters_in_l1(BlockDriverState
*bs, uint64_t *l1_table,
ret = qcow2_pre_write_overlap_check(bs, QCOW2_OL_DEFAULT,
offset, s->cluster_size);
if (ret < 0) {
- qcow2_free_clusters(bs, offset, s->cluster_size,
- QCOW2_DISCARD_ALWAYS);
+ if (!preallocated) {
+ qcow2_free_clusters(bs, offset, s->cluster_size,
+ QCOW2_DISCARD_ALWAYS);
+ }
goto fail;
}
ret = bdrv_write_zeroes(bs->file, offset / BDRV_SECTOR_SIZE,
s->cluster_sectors);
if (ret < 0) {
- qcow2_free_clusters(bs, offset, s->cluster_size,
- QCOW2_DISCARD_ALWAYS);
+ if (!preallocated) {
+ qcow2_free_clusters(bs, offset, s->cluster_size,
+ QCOW2_DISCARD_ALWAYS);
+ }
goto fail;
}
--
1.8.1.4
- [Qemu-devel] [PULL 20/30] qemu-iotests: fix qmp.py search path, (continued)
- [Qemu-devel] [PULL 20/30] qemu-iotests: fix qmp.py search path, Kevin Wolf, 2013/09/27
- [Qemu-devel] [PULL 14/30] block: vdi - use QEMU_PACKED for on-disk structures, Kevin Wolf, 2013/09/27
- [Qemu-devel] [PULL 13/30] rbd: avoid qemu_rbd_snap_list() memory leaks, Kevin Wolf, 2013/09/27
- [Qemu-devel] [PULL 18/30] qcow2: Assert against currently impossible overflow, Kevin Wolf, 2013/09/27
- [Qemu-devel] [PULL 16/30] block: qcow2 - used QEMU_PACKED for on-disk structures, Kevin Wolf, 2013/09/27
- [Qemu-devel] [PULL 19/30] block: use DIV_ROUND_UP in bdrv_co_do_readv, Kevin Wolf, 2013/09/27
- [Qemu-devel] [PULL 21/30] qemu-iotests: Add basic ability to use binary sample images, Kevin Wolf, 2013/09/27
- [Qemu-devel] [PULL 22/30] qemu-iotests: Quote $TEST_IMG* and $TEST_DIR usage, Kevin Wolf, 2013/09/27
- [Qemu-devel] [PULL 26/30] qcow2: Always use error path in l2_allocate, Kevin Wolf, 2013/09/27
- [Qemu-devel] [PULL 28/30] qcow2: count_contiguous_clusters and compression, Kevin Wolf, 2013/09/27
- [Qemu-devel] [PULL 27/30] qcow2: Free only newly allocated clusters on error,
Kevin Wolf <=
- [Qemu-devel] [PULL 29/30] qcow2: COMPRESSED on count_contiguous_clusters, Kevin Wolf, 2013/09/27
- [Qemu-devel] [PULL 30/30] qcow2: Remove useless count_contiguous_clusters() parameter, Kevin Wolf, 2013/09/27
- [Qemu-devel] [PULL 24/30] qemu-iotests: Preallocated zero clusters in 061, Kevin Wolf, 2013/09/27
- [Qemu-devel] [PULL 25/30] qcow2: Don't put invalid L2 table into cache, Kevin Wolf, 2013/09/27