From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=53568 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OZ053-0006Xw-29 for qemu-devel@nongnu.org; Wed, 14 Jul 2010 07:24:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OZ051-0001UH-Nj for qemu-devel@nongnu.org; Wed, 14 Jul 2010 07:24:48 -0400 Received: from mx1.redhat.com ([209.132.183.28]:31091) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OZ051-0001U7-G6 for qemu-devel@nongnu.org; Wed, 14 Jul 2010 07:24:47 -0400 From: Kevin Wolf Date: Wed, 14 Jul 2010 13:24:10 +0200 Message-Id: <1279106653-24351-12-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 11/14] vmdk: 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 b8852e87d9d113096342c3e0977266cda0fe9ee5) Conflicts: block/vmdk.c Signed-off-by: Kevin Wolf --- block/vmdk.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/block/vmdk.c b/block/vmdk.c index d52904a..cd87279 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -153,7 +153,7 @@ static int vmdk_write_cid(BlockDriverState *bs, uint32_t cid) pstrcat(desc, sizeof(desc), tmp_desc); } - if (bdrv_pwrite(s->hd, 0x200, desc, DESC_SIZE) != DESC_SIZE) + if (bdrv_pwrite_sync(s->hd, 0x200, desc, DESC_SIZE) < 0) return -1; return 0; } @@ -482,14 +482,14 @@ static int vmdk_L2update(BlockDriverState *bs, VmdkMetaData *m_data) BDRVVmdkState *s = bs->opaque; /* update L2 table */ - if (bdrv_pwrite(s->hd, ((int64_t)m_data->l2_offset * 512) + (m_data->l2_index * sizeof(m_data->offset)), - &(m_data->offset), sizeof(m_data->offset)) != sizeof(m_data->offset)) + if (bdrv_pwrite_sync(s->hd, ((int64_t)m_data->l2_offset * 512) + (m_data->l2_index * sizeof(m_data->offset)), + &(m_data->offset), sizeof(m_data->offset)) < 0) return -1; /* update backup L2 table */ if (s->l1_backup_table_offset != 0) { m_data->l2_offset = s->l1_backup_table[m_data->l1_index]; - if (bdrv_pwrite(s->hd, ((int64_t)m_data->l2_offset * 512) + (m_data->l2_index * sizeof(m_data->offset)), - &(m_data->offset), sizeof(m_data->offset)) != sizeof(m_data->offset)) + if (bdrv_pwrite_sync(s->hd, ((int64_t)m_data->l2_offset * 512) + (m_data->l2_index * sizeof(m_data->offset)), + &(m_data->offset), sizeof(m_data->offset)) < 0) return -1; } -- 1.7.1.1