From 8e685f62a887c4726b80fcd0427f2274b4ada00a Mon Sep 17 00:00:00 2001 From: Kevin Wolf Date: Tue, 8 Jun 2010 11:12:54 -0300 Subject: [PATCH 12/13] qcow2: Return real error code in load_refcount_block RH-Author: Kevin Wolf Message-id: <1275995574-17666-12-git-send-email-kwolf@redhat.com> Patchwork-id: 9776 O-Subject: [RHEL-6 qemu-kvm PATCH v2 11/11] qcow2: Return real error code in load_refcount_block Bugzilla: 598507 RH-Acked-by: Christoph Hellwig RH-Acked-by: Juan Quintela RH-Acked-by: Jes Sorensen Bugzilla: 598507 Upstream status: Submitted 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 files changed, 8 insertions(+), 3 deletions(-) Signed-off-by: Eduardo Habkost --- block/qcow2-refcount.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c index b8f6a00..4355ceb 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; } -- 1.7.0.3