[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [STABLE][PATCH 09/14] qcow: Use bdrv_(p)write_sync for meta
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [STABLE][PATCH 09/14] qcow: Use bdrv_(p)write_sync for metadata writes |
Date: |
Wed, 14 Jul 2010 13:24:08 +0200 |
Use bdrv_(p)write_sync to ensure metadata integrity in case of a crash.
Signed-off-by: Kevin Wolf <address@hidden>
(cherry picked from commit 5e5557d97026d1d3325e0e7b0ba593366da2f3dc)
Conflicts:
block/qcow.c
Signed-off-by: Kevin Wolf <address@hidden>
---
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
- [Qemu-devel] [STABLE][PULL 00/14] Block patches for 0.12.5, Kevin Wolf, 2010/07/14
- [Qemu-devel] [STABLE][PATCH 01/14] vmdk: fix double free, Kevin Wolf, 2010/07/14
- [Qemu-devel] [STABLE][PATCH 04/14] qcow2: Remove abort on free_clusters failure, Kevin Wolf, 2010/07/14
- [Qemu-devel] [STABLE][PATCH 03/14] vmdk: Fix COW, Kevin Wolf, 2010/07/14
- [Qemu-devel] [STABLE][PATCH 02/14] qcow2: Fix creation of large images, Kevin Wolf, 2010/07/14
- [Qemu-devel] [STABLE][PATCH 05/14] block/vpc: Fix conversion from size to disk geometry, Kevin Wolf, 2010/07/14
- [Qemu-devel] [STABLE][PATCH 06/14] block/vdi: Fix image opening and creation for odd disk sizes, Kevin Wolf, 2010/07/14
- [Qemu-devel] [STABLE][PATCH 07/14] qcow2: Restore L1 entry on l2_allocate failure, Kevin Wolf, 2010/07/14
- [Qemu-devel] [STABLE][PATCH 09/14] qcow: Use bdrv_(p)write_sync for metadata writes,
Kevin Wolf <=
- [Qemu-devel] [STABLE][PATCH 08/14] block: Add bdrv_(p)write_sync, Kevin Wolf, 2010/07/14
- [Qemu-devel] [STABLE][PATCH 11/14] vmdk: Use bdrv_(p)write_sync for metadata writes, Kevin Wolf, 2010/07/14
- [Qemu-devel] [STABLE][PATCH 10/14] qcow2: Use bdrv_(p)write_sync for metadata writes, Kevin Wolf, 2010/07/14
- [Qemu-devel] [STABLE][PATCH 13/14] block: Fix early failure in multiwrite, Kevin Wolf, 2010/07/14
- [Qemu-devel] [STABLE][PATCH 14/14] block: Handle multiwrite errors only when all requests have completed, Kevin Wolf, 2010/07/14
- [Qemu-devel] [STABLE][PATCH 12/14] vpc: Use bdrv_(p)write_sync for metadata writes, Kevin Wolf, 2010/07/14
- Re: [Qemu-devel] [STABLE][PULL 00/14] Block patches for 0.12.5, Aurelien Jarno, 2010/07/14