From patchwork Fri Feb 11 14:21:34 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 82801 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 AE329B7175 for ; Sat, 12 Feb 2011 04:36:59 +1100 (EST) Received: from localhost ([127.0.0.1]:50951 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PntzQ-0005xY-4V for incoming@patchwork.ozlabs.org; Fri, 11 Feb 2011 09:28:52 -0500 Received: from [140.186.70.92] (port=54461 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pntr5-0001kO-8z for qemu-devel@nongnu.org; Fri, 11 Feb 2011 09:20:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Pntr3-0003b3-PO for qemu-devel@nongnu.org; Fri, 11 Feb 2011 09:20:14 -0500 Received: from mx1.redhat.com ([209.132.183.28]:14078) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Pntr3-0003ay-GP for qemu-devel@nongnu.org; Fri, 11 Feb 2011 09:20:13 -0500 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 p1BEKCPA019638 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 11 Feb 2011 09:20:12 -0500 Received: from dhcp-5-188.str.redhat.com (vpn1-6-92.ams2.redhat.com [10.36.6.92]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p1BEJlNQ027710; Fri, 11 Feb 2011 09:20:10 -0500 From: Kevin Wolf To: jmforbes@linuxtx.org Date: Fri, 11 Feb 2011 15:21:34 +0100 Message-Id: <1297434094-24965-10-git-send-email-kwolf@redhat.com> In-Reply-To: <1297434094-24965-1-git-send-email-kwolf@redhat.com> References: <1297434094-24965-1-git-send-email-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH STABLE 0.14 9/9] qcow2: Fix order in L2 table COW 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 When copying L2 tables (this happens only with internal snapshots), the order wasn't completely safe, so that after a crash you could end up with a L2 table that has too low refcount, possibly leading to corruption in the long run. This patch puts the operations in the right order: First allocate the new L2 table and replace the reference, and only then decrease the refcount of the old table. Signed-off-by: Kevin Wolf (cherry picked from commit 16fde5f2c2788232b16c06d34d0459a5c1ec1f6c) --- block/qcow2-cluster.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c index 437aaa8..750abe3 100644 --- a/block/qcow2-cluster.c +++ b/block/qcow2-cluster.c @@ -515,13 +515,16 @@ static int get_cluster_table(BlockDriverState *bs, uint64_t offset, return ret; } } else { - /* FIXME Order */ - if (l2_offset) - qcow2_free_clusters(bs, l2_offset, s->l2_size * sizeof(uint64_t)); + /* First allocate a new L2 table (and do COW if needed) */ ret = l2_allocate(bs, l1_index, &l2_table); if (ret < 0) { return ret; } + + /* Then decrease the refcount of the old table */ + if (l2_offset) { + qcow2_free_clusters(bs, l2_offset, s->l2_size * sizeof(uint64_t)); + } l2_offset = s->l1_table[l1_index] & ~QCOW_OFLAG_COPIED; }