summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin Wolf <kwolf@redhat.com>2010-07-14 12:02:53 +0200
committerKevin Wolf <kwolf@redhat.com>2010-07-14 12:18:35 +0200
commit7205c21e76dec9be51a3b044bc045df75b6d7893 (patch)
tree3a61173a211987ea56ce23c6dea3921a3e78d4e0
parentblock: Add bdrv_(p)write_sync (diff)
downloadqemu-kvm-7205c21e76dec9be51a3b044bc045df75b6d7893.tar.gz
qemu-kvm-7205c21e76dec9be51a3b044bc045df75b6d7893.tar.bz2
qemu-kvm-7205c21e76dec9be51a3b044bc045df75b6d7893.zip
qcow: Use bdrv_(p)write_sync for metadata writes
Use bdrv_(p)write_sync to ensure metadata integrity in case of a crash. Signed-off-by: Kevin Wolf <kwolf@redhat.com> (cherry picked from commit 5e5557d97026d1d3325e0e7b0ba593366da2f3dc) Conflicts: block/qcow.c Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-rw-r--r--block/qcow.c18
1 files changed, 10 insertions, 8 deletions
diff --git a/block/qcow.c b/block/qcow.c
index 7fc85ae58..6a4c30f61 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;