From e14e8ba5d059687bf276077da997c3ecfb5eab86 Mon Sep 17 00:00:00 2001 From: Kevin Wolf Date: Fri, 4 Jun 2010 11:27:08 +0200 Subject: [PATCH] qcow2: Return real error code in load_refcount_block This fixes load_refcount_block which completely ignored the return value of write_refcount_block and always returned -EIO for bdrv_pwrite failure. Signed-off-by: Kevin Wolf --- block/qcow2-refcount.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c index 51948ae18d..41e1da9753 100644 --- a/block/qcow2-refcount.c +++ b/block/qcow2-refcount.c @@ -93,14 +93,19 @@ static int load_refcount_block(BlockDriverState *bs, int ret; if (cache_refcount_updates) { - write_refcount_block(bs); + ret = write_refcount_block(bs); + if (ret < 0) { + return ret; + } } BLKDBG_EVENT(bs->file, BLKDBG_REFBLOCK_LOAD); ret = bdrv_pread(bs->file, refcount_block_offset, s->refcount_block_cache, s->cluster_size); - if (ret != s->cluster_size) - return -EIO; + if (ret < 0) { + return ret; + } + s->refcount_block_cache_offset = refcount_block_offset; return 0; }