From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=53546 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OZ050-0006WN-KS for qemu-devel@nongnu.org; Wed, 14 Jul 2010 07:24:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OZ04z-0001Tm-0j for qemu-devel@nongnu.org; Wed, 14 Jul 2010 07:24:46 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44539) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OZ04y-0001Te-Qo for qemu-devel@nongnu.org; Wed, 14 Jul 2010 07:24:44 -0400 From: Kevin Wolf Date: Wed, 14 Jul 2010 13:24:08 +0200 Message-Id: <1279106653-24351-10-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> Subject: [Qemu-devel] [STABLE][PATCH 09/14] qcow: Use bdrv_(p)write_sync for metadata writes List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: aurelien@aurel32.net Cc: kwolf@redhat.com, qemu-devel@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 5e5557d97026d1d3325e0e7b0ba593366da2f3dc) Conflicts: block/qcow.c Signed-off-by: Kevin Wolf --- block/qcow.c | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/block/qcow.c b/block/qcow.c index 7fc85ae..6a4c30f 100644 --- a/block/qcow.c +++ b/block/qcow.c @@ -277,8 +277,9 @@ static uint64_t get_cluster_offset(BlockDriverState *bs, /* update the L1 entry */ s->l1_table[l1_index] = l2_offset; tmp = cpu_to_be64(l2_offset); - if (bdrv_pwrite(s->hd, s->l1_table_offset + l1_index * sizeof(tmp), - &tmp, sizeof(tmp)) != sizeof(tmp)) + if (bdrv_pwrite_sync(s->hd, + s->l1_table_offset + l1_index * sizeof(tmp), + &tmp, sizeof(tmp)) < 0) return 0; new_l2_table = 1; } @@ -306,8 +307,8 @@ static uint64_t get_cluster_offset(BlockDriverState *bs, l2_table = s->l2_cache + (min_index << s->l2_bits); if (new_l2_table) { memset(l2_table, 0, s->l2_size * sizeof(uint64_t)); - if (bdrv_pwrite(s->hd, l2_offset, l2_table, s->l2_size * sizeof(uint64_t)) != - s->l2_size * sizeof(uint64_t)) + if (bdrv_pwrite_sync(s->hd, l2_offset, l2_table, + s->l2_size * sizeof(uint64_t)) < 0) return 0; } else { if (bdrv_pread(s->hd, l2_offset, l2_table, s->l2_size * sizeof(uint64_t)) != @@ -372,8 +373,8 @@ static uint64_t get_cluster_offset(BlockDriverState *bs, /* update L2 table */ tmp = cpu_to_be64(cluster_offset); l2_table[l2_index] = tmp; - if (bdrv_pwrite(s->hd, - l2_offset + l2_index * sizeof(tmp), &tmp, sizeof(tmp)) != sizeof(tmp)) + if (bdrv_pwrite_sync(s->hd, l2_offset + l2_index * sizeof(tmp), + &tmp, sizeof(tmp)) < 0) return 0; } return cluster_offset; @@ -821,8 +822,9 @@ static int qcow_make_empty(BlockDriverState *bs) int ret; memset(s->l1_table, 0, l1_length); - if (bdrv_pwrite(s->hd, s->l1_table_offset, s->l1_table, l1_length) < 0) - return -1; + if (bdrv_pwrite_sync(s->hd, s->l1_table_offset, s->l1_table, + l1_length) < 0) + return -1; ret = bdrv_truncate(s->hd, s->l1_table_offset + l1_length); if (ret < 0) return ret; -- 1.7.1.1