OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

qcow2: Return right error code in write_refcount_block_entries

Browse Source 
write_refcount_block_entries used to return -EIO for any errors. Change this to
return the real error code.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Kevin Wolf 2010-05-28 09:47:44 +02:00
parent 55c17e9821
commit ed0df867d9
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
block/qcow2-refcount.c
View File

@ -404,6 +404,7 @@ static int write_refcount_block_entries(BlockDriverState *bs,
{ {
BDRVQcowState *s = bs->opaque; BDRVQcowState *s = bs->opaque;
size_t size; size_t size;
int ret;
if (cache_refcount_updates) { if (cache_refcount_updates) {
return 0; return 0;
@ -414,12 +415,13 @@ static int write_refcount_block_entries(BlockDriverState *bs,
& ~(REFCOUNTS_PER_SECTOR - 1); & ~(REFCOUNTS_PER_SECTOR - 1);
size = (last_index - first_index) << REFCOUNT_SHIFT; size = (last_index - first_index) << REFCOUNT_SHIFT;
BLKDBG_EVENT(bs->file, BLKDBG_REFBLOCK_UPDATE_PART); BLKDBG_EVENT(bs->file, BLKDBG_REFBLOCK_UPDATE_PART);
if (bdrv_pwrite(bs->file, ret = bdrv_pwrite(bs->file,
refcount_block_offset + (first_index << REFCOUNT_SHIFT), refcount_block_offset + (first_index << REFCOUNT_SHIFT),
&s->refcount_block_cache[first_index], size) != size) &s->refcount_block_cache[first_index], size);
{ if (ret < 0) {
return -EIO; return ret;
} }
return 0; return 0;
@ -460,10 +462,10 @@ static int QEMU_WARN_UNUSED_RESULT update_refcount(BlockDriverState *bs,
table_index = cluster_index >> (s->cluster_bits - REFCOUNT_SHIFT); table_index = cluster_index >> (s->cluster_bits - REFCOUNT_SHIFT);
if ((old_table_index >= 0) && (table_index != old_table_index)) { if ((old_table_index >= 0) && (table_index != old_table_index)) {
if (write_refcount_block_entries(bs, refcount_block_offset, ret = write_refcount_block_entries(bs, refcount_block_offset,
first_index, last_index) < 0) first_index, last_index);
{ if (ret < 0) {
return -EIO; return ret;
} }
first_index = -1; first_index = -1;
@ -505,10 +507,11 @@ fail:
/* Write last changed block to disk */ /* Write last changed block to disk */
if (refcount_block_offset != 0) { if (refcount_block_offset != 0) {
if (write_refcount_block_entries(bs, refcount_block_offset, int wret;
first_index, last_index) < 0) wret = write_refcount_block_entries(bs, refcount_block_offset,
{ first_index, last_index);
return ret < 0 ? ret : -EIO; if (wret < 0) {
return ret < 0 ? ret : wret;
} }
} }