diff options
| author |   Kevin Wolf <kwolf@redhat.com> | 2010-07-14 13:08:45 +0200 |
|---|---|---|
| committer |   Doug Goldstein <cardoe@gentoo.org> | 2010-07-20 17:41:57 -0500 |
| commit | 733f1ba2c1f01e6f02d49b51a1571e07fb856af7 (patch) | |
| tree | 446bb624f49ecf672f10bb176f9b8ffceefd5961 /block | |
| parent | vmdk: Use bdrv_(p)write_sync for metadata writes (diff) | |
| download | qemu-kvm-733f1ba2c1f01e6f02d49b51a1571e07fb856af7.tar.gz qemu-kvm-733f1ba2c1f01e6f02d49b51a1571e07fb856af7.tar.bz2 qemu-kvm-733f1ba2c1f01e6f02d49b51a1571e07fb856af7.zip | |
vpc: 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 078a458e077d6b0db262c4b05fee51d01de2d1d2)
Conflicts:
block/vpc.c
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'block')
| -rw-r--r-- | block/vpc.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/block/vpc.c b/block/vpc.c index afe6f1a9a..9e0acf4b1 100644 --- a/block/vpc.c +++ b/block/vpc.c @@ -266,7 +266,7 @@ static inline int64_t get_sector_offset(BlockDriverState *bs, s->last_bitmap_offset = bitmap_offset; memset(bitmap, 0xff, s->bitmap_size); - bdrv_pwrite(s->hd, bitmap_offset, bitmap, s->bitmap_size); + bdrv_pwrite_sync(s->hd, bitmap_offset, bitmap, s->bitmap_size); } // printf("sector: %" PRIx64 ", index: %x, offset: %x, bioff: %" PRIx64 ", bloff: %" PRIx64 "\n", @@ -316,7 +316,7 @@ static int rewrite_footer(BlockDriverState* bs) BDRVVPCState *s = bs->opaque; int64_t offset = s->free_data_block_offset; - ret = bdrv_pwrite(s->hd, offset, s->footer_buf, HEADER_SIZE); + ret = bdrv_pwrite_sync(s->hd, offset, s->footer_buf, HEADER_SIZE); if (ret < 0) return ret; @@ -351,7 +351,8 @@ static int64_t alloc_block(BlockDriverState* bs, int64_t sector_num) // Initialize the block's bitmap memset(bitmap, 0xff, s->bitmap_size); - bdrv_pwrite(s->hd, s->free_data_block_offset, bitmap, s->bitmap_size); + bdrv_pwrite_sync(s->hd, s->free_data_block_offset, bitmap, + s->bitmap_size); // Write new footer (the old one will be overwritten) s->free_data_block_offset += s->block_size + s->bitmap_size; @@ -362,7 +363,7 @@ static int64_t alloc_block(BlockDriverState* bs, int64_t sector_num) // Write BAT entry to disk bat_offset = s->bat_offset + (4 * index); bat_value = be32_to_cpu(s->pagetable[index]); - ret = bdrv_pwrite(s->hd, bat_offset, &bat_value, 4); + ret = bdrv_pwrite_sync(s->hd, bat_offset, &bat_value, 4); if (ret < 0) goto fail; |