Patchwork [PULL,6/8] qcow2: Free allocated L2 cluster on error

login
register
mail settings
Submitter Stefan Hajnoczi
Date Oct. 7, 2013, 11:28 a.m.
Message ID <1381145289-6591-7-git-send-email-stefanha@redhat.com>
Download mbox | patch
Permalink /patch/281079/
State New
Headers show

Comments

Stefan Hajnoczi - Oct. 7, 2013, 11:28 a.m.
From: Max Reitz <mreitz@redhat.com>

If an error occurs in l2_allocate, the allocated (but unused) L2 cluster
should be freed.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Benoit Canet <benoit@irqsave.net>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 block/qcow2-cluster.c | 4 ++++
 1 file changed, 4 insertions(+)

Patch

diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c
index 2ed45f0..0fd26bb 100644
--- a/block/qcow2-cluster.c
+++ b/block/qcow2-cluster.c
@@ -273,6 +273,10 @@  fail:
         qcow2_cache_put(bs, s->l2_table_cache, (void**) table);
     }
     s->l1_table[l1_index] = old_l2_offset;
+    if (l2_offset > 0) {
+        qcow2_free_clusters(bs, l2_offset, s->l2_size * sizeof(uint64_t),
+                            QCOW2_DISCARD_ALWAYS);
+    }
     return ret;
 }