[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 07/14] qcow: Use bdrv_(p)write_sync for metadata wri
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH 07/14] qcow: Use bdrv_(p)write_sync for metadata writes |
Date: |
Tue, 22 Jun 2010 16:09:26 +0200 |
Use bdrv_(p)write_sync to ensure metadata integrity in case of a crash.
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 449858f..816103d 100644
--- a/block/qcow.c
+++ b/block/qcow.c
@@ -273,8 +273,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(bs->file, s->l1_table_offset + l1_index * sizeof(tmp),
- &tmp, sizeof(tmp)) != sizeof(tmp))
+ if (bdrv_pwrite_sync(bs->file,
+ s->l1_table_offset + l1_index * sizeof(tmp),
+ &tmp, sizeof(tmp)) < 0)
return 0;
new_l2_table = 1;
}
@@ -302,8 +303,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(bs->file, l2_offset, l2_table, s->l2_size *
sizeof(uint64_t)) !=
- s->l2_size * sizeof(uint64_t))
+ if (bdrv_pwrite_sync(bs->file, l2_offset, l2_table,
+ s->l2_size * sizeof(uint64_t)) < 0)
return 0;
} else {
if (bdrv_pread(bs->file, l2_offset, l2_table, s->l2_size *
sizeof(uint64_t)) !=
@@ -368,8 +369,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(bs->file,
- l2_offset + l2_index * sizeof(tmp), &tmp, sizeof(tmp))
!= sizeof(tmp))
+ if (bdrv_pwrite_sync(bs->file, l2_offset + l2_index * sizeof(tmp),
+ &tmp, sizeof(tmp)) < 0)
return 0;
}
return cluster_offset;
@@ -835,8 +836,9 @@ static int qcow_make_empty(BlockDriverState *bs)
int ret;
memset(s->l1_table, 0, l1_length);
- if (bdrv_pwrite(bs->file, s->l1_table_offset, s->l1_table, l1_length) < 0)
- return -1;
+ if (bdrv_pwrite_sync(bs->file, s->l1_table_offset, s->l1_table,
+ l1_length) < 0)
+ return -1;
ret = bdrv_truncate(bs->file, s->l1_table_offset + l1_length);
if (ret < 0)
return ret;
--
1.6.6.1
- [Qemu-devel] [PULL 00/14] Block patches, Kevin Wolf, 2010/06/22
- [Qemu-devel] [PATCH 02/14] scsi-bus: Add MAINTENANCE_IN and MAINTENANCE_OUT SCSIRequest xfer and mode assignments, Kevin Wolf, 2010/06/22
- [Qemu-devel] [PATCH 03/14] block: fix physical_block_size calculation, Kevin Wolf, 2010/06/22
- [Qemu-devel] [PATCH 01/14] scsi-bus: Add PERSISTENT_RESERVE_OUT SCSIRequest->cmd.mode setup, Kevin Wolf, 2010/06/22
- [Qemu-devel] [PATCH 05/14] block: Add bdrv_(p)write_sync, Kevin Wolf, 2010/06/22
- [Qemu-devel] [PATCH 04/14] monitor: allow device to be ejected if no disk is inserted, Kevin Wolf, 2010/06/22
- [Qemu-devel] [PATCH 07/14] qcow: Use bdrv_(p)write_sync for metadata writes,
Kevin Wolf <=
- [Qemu-devel] [PATCH 09/14] vmdk: Use bdrv_(p)write_sync for metadata writes, Kevin Wolf, 2010/06/22
- [Qemu-devel] [PATCH 06/14] cow: Use bdrv_(p)write_sync for metadata writes, Kevin Wolf, 2010/06/22
- [Qemu-devel] [PATCH 11/14] qemu-io: check registered fds in command_loop(), Kevin Wolf, 2010/06/22
- [Qemu-devel] [PATCH 12/14] virtio-blk: fix the list operation in virtio_blk_load()., Kevin Wolf, 2010/06/22
- [Qemu-devel] [PATCH 08/14] qcow2: Use bdrv_(p)write_sync for metadata writes, Kevin Wolf, 2010/06/22
- [Qemu-devel] [PATCH 13/14] qcow2: Fix qemu-img check segfault on corrupted images, Kevin Wolf, 2010/06/22
- [Qemu-devel] [PATCH 10/14] vpc: Use bdrv_(p)write_sync for metadata writes, Kevin Wolf, 2010/06/22
- [Qemu-devel] [PATCH 14/14] qcow2: Don't try to check tables that couldn't be loaded, Kevin Wolf, 2010/06/22