From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32928) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XrVC4-0003RO-Jr for qemu-devel@nongnu.org; Thu, 20 Nov 2014 12:07:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XrVBy-0000iU-DR for qemu-devel@nongnu.org; Thu, 20 Nov 2014 12:06:56 -0500 Received: from mx1.redhat.com ([209.132.183.28]:34270) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XrVBy-0000iN-5M for qemu-devel@nongnu.org; Thu, 20 Nov 2014 12:06:50 -0500 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id sAKH6nXa016293 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Thu, 20 Nov 2014 12:06:49 -0500 From: Max Reitz Date: Thu, 20 Nov 2014 18:06:20 +0100 Message-Id: <1416503198-17031-5-git-send-email-mreitz@redhat.com> In-Reply-To: <1416503198-17031-1-git-send-email-mreitz@redhat.com> References: <1416503198-17031-1-git-send-email-mreitz@redhat.com> Subject: [Qemu-devel] [PATCH v3 04/22] qcow2: Respect error in qcow2_alloc_bytes() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Stefan Hajnoczi , Max Reitz qcow2_update_cluster_refcount() may fail, and qcow2_alloc_bytes() should mind that case. Signed-off-by: Max Reitz Reviewed-by: Eric Blake --- block/qcow2-refcount.c | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c index 6e06531..be4e5fe 100644 --- a/block/qcow2-refcount.c +++ b/block/qcow2-refcount.c @@ -761,7 +761,8 @@ int qcow2_alloc_clusters_at(BlockDriverState *bs, uint64_t offset, int64_t qcow2_alloc_bytes(BlockDriverState *bs, int size) { BDRVQcowState *s = bs->opaque; - int64_t offset, cluster_offset; + int64_t offset, cluster_offset, new_cluster; + int64_t ret; int free_in_cluster; BLKDBG_EVENT(bs->file, BLKDBG_CLUSTER_ALLOC_BYTES); @@ -783,23 +784,32 @@ int64_t qcow2_alloc_bytes(BlockDriverState *bs, int size) free_in_cluster -= size; if (free_in_cluster == 0) s->free_byte_offset = 0; - if (offset_into_cluster(s, offset) != 0) - qcow2_update_cluster_refcount(bs, offset >> s->cluster_bits, 1, - QCOW2_DISCARD_NEVER); + if (offset_into_cluster(s, offset) != 0) { + ret = qcow2_update_cluster_refcount(bs, offset >> s->cluster_bits, + 1, QCOW2_DISCARD_NEVER); + if (ret < 0) { + return ret; + } + } } else { - offset = qcow2_alloc_clusters(bs, s->cluster_size); - if (offset < 0) { - return offset; + new_cluster = qcow2_alloc_clusters(bs, s->cluster_size); + if (new_cluster < 0) { + return new_cluster; } cluster_offset = start_of_cluster(s, s->free_byte_offset); - if ((cluster_offset + s->cluster_size) == offset) { + if ((cluster_offset + s->cluster_size) == new_cluster) { /* we are lucky: contiguous data */ offset = s->free_byte_offset; - qcow2_update_cluster_refcount(bs, offset >> s->cluster_bits, 1, - QCOW2_DISCARD_NEVER); + ret = qcow2_update_cluster_refcount(bs, offset >> s->cluster_bits, + 1, QCOW2_DISCARD_NEVER); + if (ret < 0) { + qcow2_free_clusters(bs, new_cluster, s->cluster_size, + QCOW2_DISCARD_NEVER); + return ret; + } s->free_byte_offset += size; } else { - s->free_byte_offset = offset; + s->free_byte_offset = new_cluster; goto redo; } } -- 1.9.3