From patchwork Wed Jan 20 14:03:04 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 43291 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 66052B7C7E for ; Thu, 21 Jan 2010 01:26:29 +1100 (EST) Received: from localhost ([127.0.0.1]:44735 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NXbVR-0000Ay-4c for incoming@patchwork.ozlabs.org; Wed, 20 Jan 2010 09:26:01 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NXbAR-000790-Et for qemu-devel@nongnu.org; Wed, 20 Jan 2010 09:04:19 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NXbAK-0006zr-07 for qemu-devel@nongnu.org; Wed, 20 Jan 2010 09:04:16 -0500 Received: from [199.232.76.173] (port=43302 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NXbAJ-0006zl-9o for qemu-devel@nongnu.org; Wed, 20 Jan 2010 09:04:11 -0500 Received: from mx1.redhat.com ([209.132.183.28]:39558) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NXbAI-0003MD-O7 for qemu-devel@nongnu.org; Wed, 20 Jan 2010 09:04:10 -0500 Received: from int-mx05.intmail.prod.int.phx2.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.18]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o0KE49CG030027 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 20 Jan 2010 09:04:10 -0500 Received: from localhost.localdomain (dhcp-5-175.str.redhat.com [10.32.5.175]) by int-mx05.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o0KE40Q4030534; Wed, 20 Jan 2010 09:04:08 -0500 From: Kevin Wolf To: qemu-devel@nongnu.org Date: Wed, 20 Jan 2010 15:03:04 +0100 Message-Id: <1263996186-6623-8-git-send-email-kwolf@redhat.com> In-Reply-To: <1263996186-6623-1-git-send-email-kwolf@redhat.com> References: <1263996186-6623-1-git-send-email-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.18 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: Kevin Wolf Subject: [Qemu-devel] [PATCH v2 07/10] qcow2: Improve error handling in update_refcount X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org If update_refcount fails, try to undo any changes made so far to avoid inconsistencies in the image file. Signed-off-by: Kevin Wolf --- block/qcow2-refcount.c | 32 +++++++++++++++++++++++++------- 1 files changed, 25 insertions(+), 7 deletions(-) diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c index 6f449c6..a84620f 100644 --- a/block/qcow2-refcount.c +++ b/block/qcow2-refcount.c @@ -278,6 +278,7 @@ static int update_refcount(BlockDriverState *bs, int64_t refcount_block_offset = 0; int64_t table_index = -1, old_table_index; int first_index = -1, last_index = -1; + int ret; #ifdef DEBUG_ALLOC2 printf("update_refcount: offset=%" PRId64 " size=%" PRId64 " addend=%d\n", @@ -292,6 +293,7 @@ static int update_refcount(BlockDriverState *bs, { int block_index, refcount; int64_t cluster_index = cluster_offset >> s->cluster_bits; + int64_t new_block; /* Only write refcount block to disk when we are done with it */ old_table_index = table_index; @@ -309,10 +311,12 @@ static int update_refcount(BlockDriverState *bs, } /* Load the refcount block and allocate it if needed */ - refcount_block_offset = alloc_refcount_block(bs, cluster_index); - if (refcount_block_offset < 0) { - return refcount_block_offset; + new_block = alloc_refcount_block(bs, cluster_index); + if (new_block < 0) { + ret = new_block; + goto fail; } + refcount_block_offset = new_block; /* we can update the count and save it */ block_index = cluster_index & @@ -326,24 +330,38 @@ static int update_refcount(BlockDriverState *bs, refcount = be16_to_cpu(s->refcount_block_cache[block_index]); refcount += addend; - if (refcount < 0 || refcount > 0xffff) - return -EINVAL; + if (refcount < 0 || refcount > 0xffff) { + ret = -EINVAL; + goto fail; + } if (refcount == 0 && cluster_index < s->free_cluster_index) { s->free_cluster_index = cluster_index; } s->refcount_block_cache[block_index] = cpu_to_be16(refcount); } + ret = 0; +fail: + /* Write last changed block to disk */ if (refcount_block_offset != 0) { if (write_refcount_block_entries(s, refcount_block_offset, first_index, last_index) < 0) { - return -EIO; + return ret < 0 ? ret : -EIO; } } - return 0; + /* + * Try do undo any updates if an error is returned (This may succeed in + * some cases like ENOSPC for allocating a new refcount block) + */ + if (ret < 0) { + int dummy; + dummy = update_refcount(bs, offset, cluster_offset - offset, -addend); + } + + return ret; } /* addend must be 1 or -1 */