From cf6287bc4212ad744d04e72ccdd015b9d9552e23 Mon Sep 17 00:00:00 2001 From: Max Reitz Date: Mon, 27 Nov 2017 16:19:56 +0100 Subject: [PATCH 01/21] qcow2: fix return error code in qcow2_truncate() RH-Author: Max Reitz Message-id: <20171127161959.13234-2-mreitz@redhat.com> Patchwork-id: 77912 O-Subject: [RHV-7.5 qemu-kvm-rhev PATCH 1/4] qcow2: fix return error code in qcow2_truncate() Bugzilla: 1414049 RH-Acked-by: Stefan Hajnoczi RH-Acked-by: Jeffrey Cody RH-Acked-by: Fam Zheng RH-Acked-by: John Snow From: Pavel Butsykin Signed-off-by: Pavel Butsykin Reviewed-by: Eric Blake Reviewed-by: John Snow Reviewed-by: Max Reitz Message-id: 20170929121613.25997-2-pbutsykin@virtuozzo.com Signed-off-by: Max Reitz (cherry picked from commit 76a2a30a99c670e9ec1b4a5d976868059c6bc258) Signed-off-by: Max Reitz Signed-off-by: Miroslav Rezanina --- block/qcow2.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index 40ba26c..af7b1e7 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -3159,7 +3159,7 @@ static int qcow2_truncate(BlockDriverState *bs, int64_t offset, if (old_file_size < 0) { error_setg_errno(errp, -old_file_size, "Failed to inquire current file length"); - return ret; + return old_file_size; } nb_new_data_clusters = DIV_ROUND_UP(offset - old_length, @@ -3188,7 +3188,7 @@ static int qcow2_truncate(BlockDriverState *bs, int64_t offset, if (allocation_start < 0) { error_setg_errno(errp, -allocation_start, "Failed to resize refcount structures"); - return -allocation_start; + return allocation_start; } clusters_allocated = qcow2_alloc_clusters_at(bs, allocation_start, -- 1.8.3.1