From patchwork Fri Jun 18 15:03:29 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 56201 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 3A8C6B7D64 for ; Sat, 19 Jun 2010 01:14:21 +1000 (EST) Received: from localhost ([127.0.0.1]:59038 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OPdGr-0006tn-WA for incoming@patchwork.ozlabs.org; Fri, 18 Jun 2010 11:14:18 -0400 Received: from [140.186.70.92] (port=52941 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OPd6p-000828-1U for qemu-devel@nongnu.org; Fri, 18 Jun 2010 11:03:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OPd6n-0007OC-NS for qemu-devel@nongnu.org; Fri, 18 Jun 2010 11:03:54 -0400 Received: from mx1.redhat.com ([209.132.183.28]:10763) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OPd6n-0007Nv-Gw for qemu-devel@nongnu.org; Fri, 18 Jun 2010 11:03:53 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o5IF3qan020061 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 18 Jun 2010 11:03:52 -0400 Received: from localhost.localdomain (vpn1-6-103.ams2.redhat.com [10.36.6.103]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o5IF3dsa028608; Fri, 18 Jun 2010 11:03:51 -0400 From: Kevin Wolf To: qemu-devel@nongnu.org Date: Fri, 18 Jun 2010 17:03:29 +0200 Message-Id: <1276873409-8235-7-git-send-email-kwolf@redhat.com> In-Reply-To: <1276873409-8235-1-git-send-email-kwolf@redhat.com> References: <1276873409-8235-1-git-send-email-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: kwolf@redhat.com Subject: [Qemu-devel] [PATCH 6/6] vpc: Use bdrv_(p)write_sync for metadata writes 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 Use bdrv_(p)write_sync to ensure metadata integrity in case of a crash. Signed-off-by: Kevin Wolf --- block/vpc.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/block/vpc.c b/block/vpc.c index f1f73e2..e50509e 100644 --- a/block/vpc.c +++ b/block/vpc.c @@ -261,7 +261,7 @@ static inline int64_t get_sector_offset(BlockDriverState *bs, s->last_bitmap_offset = bitmap_offset; memset(bitmap, 0xff, s->bitmap_size); - bdrv_pwrite(bs->file, bitmap_offset, bitmap, s->bitmap_size); + bdrv_pwrite_sync(bs->file, bitmap_offset, bitmap, s->bitmap_size); } // printf("sector: %" PRIx64 ", index: %x, offset: %x, bioff: %" PRIx64 ", bloff: %" PRIx64 "\n", @@ -311,7 +311,7 @@ static int rewrite_footer(BlockDriverState* bs) BDRVVPCState *s = bs->opaque; int64_t offset = s->free_data_block_offset; - ret = bdrv_pwrite(bs->file, offset, s->footer_buf, HEADER_SIZE); + ret = bdrv_pwrite_sync(bs->file, offset, s->footer_buf, HEADER_SIZE); if (ret < 0) return ret; @@ -346,7 +346,8 @@ static int64_t alloc_block(BlockDriverState* bs, int64_t sector_num) // Initialize the block's bitmap memset(bitmap, 0xff, s->bitmap_size); - bdrv_pwrite(bs->file, s->free_data_block_offset, bitmap, s->bitmap_size); + bdrv_pwrite_sync(bs->file, s->free_data_block_offset, bitmap, + s->bitmap_size); // Write new footer (the old one will be overwritten) s->free_data_block_offset += s->block_size + s->bitmap_size; @@ -357,7 +358,7 @@ static int64_t alloc_block(BlockDriverState* bs, int64_t sector_num) // Write BAT entry to disk bat_offset = s->bat_offset + (4 * index); bat_value = be32_to_cpu(s->pagetable[index]); - ret = bdrv_pwrite(bs->file, bat_offset, &bat_value, 4); + ret = bdrv_pwrite_sync(bs->file, bat_offset, &bat_value, 4); if (ret < 0) goto fail;