[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 06/14] cow: Use bdrv_(p)write_sync for metadata writ
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH 06/14] cow: Use bdrv_(p)write_sync for metadata writes |
Date: |
Tue, 22 Jun 2010 16:09:25 +0200 |
Use bdrv_(p)write_sync to ensure metadata integrity in case of a crash.
While at it, correct the wrong usage of errno.
Signed-off-by: Kevin Wolf <address@hidden>
---
block/cow.c | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/block/cow.c b/block/cow.c
index d146434..eedcc48 100644
--- a/block/cow.c
+++ b/block/cow.c
@@ -97,17 +97,18 @@ static inline int cow_set_bit(BlockDriverState *bs, int64_t
bitnum)
{
uint64_t offset = sizeof(struct cow_header_v2) + bitnum / 8;
uint8_t bitmap;
+ int ret;
- if (bdrv_pread(bs->file, offset, &bitmap, sizeof(bitmap)) !=
- sizeof(bitmap)) {
- return -errno;
+ ret = bdrv_pread(bs->file, offset, &bitmap, sizeof(bitmap));
+ if (ret < 0) {
+ return ret;
}
bitmap |= (1 << (bitnum % 8));
- if (bdrv_pwrite(bs->file, offset, &bitmap, sizeof(bitmap)) !=
- sizeof(bitmap)) {
- return -errno;
+ ret = bdrv_pwrite_sync(bs->file, offset, &bitmap, sizeof(bitmap));
+ if (ret < 0) {
+ return ret;
}
return 0;
}
@@ -116,10 +117,11 @@ static inline int is_bit_set(BlockDriverState *bs,
int64_t bitnum)
{
uint64_t offset = sizeof(struct cow_header_v2) + bitnum / 8;
uint8_t bitmap;
+ int ret;
- if (bdrv_pread(bs->file, offset, &bitmap, sizeof(bitmap)) !=
- sizeof(bitmap)) {
- return -errno;
+ ret = bdrv_pread(bs->file, offset, &bitmap, sizeof(bitmap));
+ if (ret < 0) {
+ return ret;
}
return !!(bitmap & (1 << (bitnum % 8)));
--
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, 2010/06/22
- [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 <=
- [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