From patchwork Wed Jul 14 11:24:11 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 58874 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 C7FE0B6F0C for ; Wed, 14 Jul 2010 21:36:30 +1000 (EST) Received: from localhost ([127.0.0.1]:42710 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OZ0Fy-00052U-81 for incoming@patchwork.ozlabs.org; Wed, 14 Jul 2010 07:36:06 -0400 Received: from [140.186.70.92] (port=53618 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OZ058-0006by-UG for qemu-devel@nongnu.org; Wed, 14 Jul 2010 07:24:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OZ056-0001VQ-Ln for qemu-devel@nongnu.org; Wed, 14 Jul 2010 07:24:54 -0400 Received: from mx1.redhat.com ([209.132.183.28]:62692) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OZ056-0001VD-Cu for qemu-devel@nongnu.org; Wed, 14 Jul 2010 07:24:52 -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 o6EBOiQ2005191 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 14 Jul 2010 07:24:44 -0400 Received: from dhcp-5-188.str.redhat.com (vpn2-8-54.ams2.redhat.com [10.36.8.54]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o6EBOFBp023208; Wed, 14 Jul 2010 07:24:42 -0400 From: Kevin Wolf To: aurelien@aurel32.net Date: Wed, 14 Jul 2010 13:24:11 +0200 Message-Id: <1279106653-24351-13-git-send-email-kwolf@redhat.com> In-Reply-To: <1279106653-24351-1-git-send-email-kwolf@redhat.com> References: <1279106653-24351-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, qemu-devel@nongnu.org Subject: [Qemu-devel] [STABLE][PATCH 12/14] 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 (cherry picked from commit 078a458e077d6b0db262c4b05fee51d01de2d1d2) Conflicts: block/vpc.c 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 afe6f1a..9e0acf4 100644 --- a/block/vpc.c +++ b/block/vpc.c @@ -266,7 +266,7 @@ static inline int64_t get_sector_offset(BlockDriverState *bs, s->last_bitmap_offset = bitmap_offset; memset(bitmap, 0xff, s->bitmap_size); - bdrv_pwrite(s->hd, bitmap_offset, bitmap, s->bitmap_size); + bdrv_pwrite_sync(s->hd, bitmap_offset, bitmap, s->bitmap_size); } // printf("sector: %" PRIx64 ", index: %x, offset: %x, bioff: %" PRIx64 ", bloff: %" PRIx64 "\n", @@ -316,7 +316,7 @@ static int rewrite_footer(BlockDriverState* bs) BDRVVPCState *s = bs->opaque; int64_t offset = s->free_data_block_offset; - ret = bdrv_pwrite(s->hd, offset, s->footer_buf, HEADER_SIZE); + ret = bdrv_pwrite_sync(s->hd, offset, s->footer_buf, HEADER_SIZE); if (ret < 0) return ret; @@ -351,7 +351,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(s->hd, s->free_data_block_offset, bitmap, s->bitmap_size); + bdrv_pwrite_sync(s->hd, 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; @@ -362,7 +363,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(s->hd, bat_offset, &bat_value, 4); + ret = bdrv_pwrite_sync(s->hd, bat_offset, &bat_value, 4); if (ret < 0) goto fail;