From patchwork Fri Sep 17 16:18:36 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 65091 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 D21A3B6EF7 for ; Sat, 18 Sep 2010 02:22:31 +1000 (EST) Received: from localhost ([127.0.0.1]:59780 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Owdhk-0001zM-IK for incoming@patchwork.ozlabs.org; Fri, 17 Sep 2010 12:22:28 -0400 Received: from [140.186.70.92] (port=56628 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Owddn-00008z-Un for qemu-devel@nongnu.org; Fri, 17 Sep 2010 12:18:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Owddm-0001WP-MZ for qemu-devel@nongnu.org; Fri, 17 Sep 2010 12:18:23 -0400 Received: from mx1.redhat.com ([209.132.183.28]:12692) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Owddm-0001WG-ER for qemu-devel@nongnu.org; Fri, 17 Sep 2010 12:18:22 -0400 Received: from int-mx08.intmail.prod.int.phx2.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o8HGILEZ017343 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 17 Sep 2010 12:18:21 -0400 Received: from dhcp-5-188.str.redhat.com (vpn2-9-105.ams2.redhat.com [10.36.9.105]) by int-mx08.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o8HGIEUe001945; Fri, 17 Sep 2010 12:18:20 -0400 From: Kevin Wolf To: qemu-devel@nongnu.org Date: Fri, 17 Sep 2010 18:18:36 +0200 Message-Id: <1284740318-20838-3-git-send-email-kwolf@redhat.com> In-Reply-To: <1284740318-20838-1-git-send-email-kwolf@redhat.com> References: <1284740318-20838-1-git-send-email-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.21 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: kwolf@redhat.com Subject: [Qemu-devel] [PATCH 2/4] qcow2: Move sync out of 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 Note that the flush is omitted intentionally in qcow2_free_clusters. If anything, we can leak clusters here if we lose the writes. Signed-off-by: Kevin Wolf --- block/qcow2-refcount.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c index 7dc75d1..4fc3f80 100644 --- a/block/qcow2-refcount.c +++ b/block/qcow2-refcount.c @@ -261,6 +261,8 @@ static int64_t alloc_refcount_block(BlockDriverState *bs, int64_t cluster_index) goto fail_block; } + bdrv_flush(bs->file); + /* Initialize the new refcount block only after updating its refcount, * update_refcount uses the refcount cache itself */ memset(s->refcount_block_cache, 0, s->cluster_size); @@ -551,8 +553,6 @@ fail: dummy = update_refcount(bs, offset, cluster_offset - offset, -addend); } - bdrv_flush(bs->file); - return ret; } @@ -575,6 +575,8 @@ static int update_cluster_refcount(BlockDriverState *bs, return ret; } + bdrv_flush(bs->file); + return get_refcount(bs, cluster_index); } @@ -626,6 +628,9 @@ int64_t qcow2_alloc_clusters(BlockDriverState *bs, int64_t size) if (ret < 0) { return ret; } + + bdrv_flush(bs->file); + return offset; } @@ -803,6 +808,10 @@ int qcow2_update_snapshot_refcount(BlockDriverState *bs, if (ret < 0) { goto fail; } + + /* TODO Flushing once for the whole function should + * be enough */ + bdrv_flush(bs->file); } /* compressed clusters are never modified */ refcount = 2;