OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

qcow2: Free only newly allocated clusters on error 

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 <mreitz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Max Reitz 2013-09-27 10:21:48 +02:00 committed by Kevin Wolf
parent be0b742ee3
commit 320c706666
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
block/qcow2-cluster.c
View File

@ -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]); uint64_t l2_entry = be64_to_cpu(l2_table[j]);
int64_t offset = l2_entry & L2E_OFFSET_MASK, cluster_index; int64_t offset = l2_entry & L2E_OFFSET_MASK, cluster_index;
int cluster_type = qcow2_get_cluster_type(l2_entry); int cluster_type = qcow2_get_cluster_type(l2_entry);
bool preallocated = offset != 0;
if (cluster_type == QCOW2_CLUSTER_NORMAL) { if (cluster_type == QCOW2_CLUSTER_NORMAL) {
cluster_index = offset >> s->cluster_bits; cluster_index = offset >> s->cluster_bits;
@ -1579,8 +1580,7 @@ static int expand_zero_clusters_in_l1(BlockDriverState *bs, uint64_t *l1_table,
continue; continue;
} }
if (!offset) { if (!preallocated) {
/* not preallocated */
if (!bs->backing_hd) { if (!bs->backing_hd) {
/* not backed; therefore we can simply deallocate the /* not backed; therefore we can simply deallocate the
* cluster */ * 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, ret = qcow2_pre_write_overlap_check(bs, QCOW2_OL_DEFAULT,
offset, s->cluster_size); offset, s->cluster_size);
if (ret < 0) { if (ret < 0) {
qcow2_free_clusters(bs, offset, s->cluster_size, if (!preallocated) {
QCOW2_DISCARD_ALWAYS); qcow2_free_clusters(bs, offset, s->cluster_size,
QCOW2_DISCARD_ALWAYS);
}
goto fail; goto fail;
} }
ret = bdrv_write_zeroes(bs->file, offset / BDRV_SECTOR_SIZE, ret = bdrv_write_zeroes(bs->file, offset / BDRV_SECTOR_SIZE,
s->cluster_sectors); s->cluster_sectors);
if (ret < 0) { if (ret < 0) {
qcow2_free_clusters(bs, offset, s->cluster_size, if (!preallocated) {
QCOW2_DISCARD_ALWAYS); qcow2_free_clusters(bs, offset, s->cluster_size,
QCOW2_DISCARD_ALWAYS);
}
goto fail; goto fail;
} }