From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51655) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VOqDd-0000hU-LI for qemu-devel@nongnu.org; Wed, 25 Sep 2013 10:37:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VOqDX-0007ws-H2 for qemu-devel@nongnu.org; Wed, 25 Sep 2013 10:37:33 -0400 Received: from mx1.redhat.com ([209.132.183.28]:31311) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VOqDX-0007wn-A8 for qemu-devel@nongnu.org; Wed, 25 Sep 2013 10:37:27 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r8PEbQZK018623 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 25 Sep 2013 10:37:26 -0400 From: Max Reitz Date: Wed, 25 Sep 2013 16:37:19 +0200 Message-Id: <1380119840-12672-3-git-send-email-mreitz@redhat.com> In-Reply-To: <1380119840-12672-1-git-send-email-mreitz@redhat.com> References: <1380119840-12672-1-git-send-email-mreitz@redhat.com> Subject: [Qemu-devel] [PATCH 2/3] qcow2: Free allocated L2 cluster on error List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Stefan Hajnoczi , Max Reitz If an error occurs in l2_allocate, the allocated (but unused) L2 cluster should be freed. Signed-off-by: Max Reitz --- block/qcow2-cluster.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c index f6d47c9..1c3d3fc 100644 --- a/block/qcow2-cluster.c +++ b/block/qcow2-cluster.c @@ -269,6 +269,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; } -- 1.8.3.1