From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51663) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VOqDg-0000kt-H9 for qemu-devel@nongnu.org; Wed, 25 Sep 2013 10:37:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VOqDZ-0007xD-Fz for qemu-devel@nongnu.org; Wed, 25 Sep 2013 10:37:36 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44555) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VOqDZ-0007x7-8d for qemu-devel@nongnu.org; Wed, 25 Sep 2013 10:37:29 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r8PEbS6h010168 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 25 Sep 2013 10:37:28 -0400 From: Max Reitz Date: Wed, 25 Sep 2013 16:37:20 +0200 Message-Id: <1380119840-12672-4-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 3/3] qcow2: Always use error path in l2_allocate List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Stefan Hajnoczi , Max Reitz Just returning -errno in some cases prevents trace_qcow2_l2_allocate_done from being executed (and, in one case, also the unused allocated L2 table from being freed). Always going down the error path fixes this. Signed-off-by: Max Reitz --- block/qcow2-cluster.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c index 1c3d3fc..c442f6c 100644 --- a/block/qcow2-cluster.c +++ b/block/qcow2-cluster.c @@ -200,7 +200,8 @@ static int l2_allocate(BlockDriverState *bs, int l1_index, uint64_t **table) l2_offset = qcow2_alloc_clusters(bs, s->l2_size * sizeof(uint64_t)); if (l2_offset < 0) { - return l2_offset; + ret = l2_offset; + goto fail; } ret = qcow2_cache_flush(bs, s->refcount_block_cache); @@ -213,7 +214,7 @@ static int l2_allocate(BlockDriverState *bs, int l1_index, uint64_t **table) trace_qcow2_l2_allocate_get_empty(bs, l1_index); ret = qcow2_cache_get_empty(bs, s->l2_table_cache, l2_offset, (void**) table); if (ret < 0) { - return ret; + goto fail; } l2_table = *table; -- 1.8.3.1