|
 |
1bdc94 |
From 2854a11fc02a664688ddc3ccbd7786f0aec219bd Mon Sep 17 00:00:00 2001
|
|
|
1bdc94 |
From: Kevin Wolf <kwolf@redhat.com>
|
|
|
1bdc94 |
Date: Thu, 12 Jul 2018 14:42:53 +0200
|
|
|
1bdc94 |
Subject: [PATCH 34/89] qcow2: Fix qcow2_truncate() error return value
|
|
|
1bdc94 |
|
|
|
1bdc94 |
RH-Author: Kevin Wolf <kwolf@redhat.com>
|
|
|
1bdc94 |
Message-id: <20180712144258.17303-2-kwolf@redhat.com>
|
|
|
1bdc94 |
Patchwork-id: 81325
|
|
|
1bdc94 |
O-Subject: [RHV-7.6 qemu-kvm-rhev PATCH 1/6] qcow2: Fix qcow2_truncate() error return value
|
|
|
1bdc94 |
Bugzilla: 1595173
|
|
|
1bdc94 |
RH-Acked-by: Max Reitz <mreitz@redhat.com>
|
|
|
1bdc94 |
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
1bdc94 |
RH-Acked-by: John Snow <jsnow@redhat.com>
|
|
|
1bdc94 |
|
|
|
1bdc94 |
If qcow2_alloc_clusters_at() returns an error, we do need to negate it
|
|
|
1bdc94 |
to get back the positive errno code for error_setg_errno(), but we still
|
|
|
1bdc94 |
need to return the negative error code.
|
|
|
1bdc94 |
|
|
|
1bdc94 |
Fixes: 772d1f973f87269f6a4a4ea4b880680f3779bbdf
|
|
|
1bdc94 |
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
1bdc94 |
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
1bdc94 |
(cherry picked from commit ae5475e82fd1ebb24f4f77cf28f59ca6548c6136)
|
|
|
1bdc94 |
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
1bdc94 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
1bdc94 |
---
|
|
|
1bdc94 |
block/qcow2.c | 2 +-
|
|
|
1bdc94 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
1bdc94 |
|
|
|
1bdc94 |
diff --git a/block/qcow2.c b/block/qcow2.c
|
|
|
1bdc94 |
index da74e2a..dbd448c 100644
|
|
|
1bdc94 |
--- a/block/qcow2.c
|
|
|
1bdc94 |
+++ b/block/qcow2.c
|
|
|
1bdc94 |
@@ -3594,7 +3594,7 @@ static int qcow2_truncate(BlockDriverState *bs, int64_t offset,
|
|
|
1bdc94 |
if (clusters_allocated < 0) {
|
|
|
1bdc94 |
error_setg_errno(errp, -clusters_allocated,
|
|
|
1bdc94 |
"Failed to allocate data clusters");
|
|
|
1bdc94 |
- return -clusters_allocated;
|
|
|
1bdc94 |
+ return clusters_allocated;
|
|
|
1bdc94 |
}
|
|
|
1bdc94 |
|
|
|
1bdc94 |
assert(clusters_allocated == nb_new_data_clusters);
|
|
|
1bdc94 |
--
|
|
|
1bdc94 |
1.8.3.1
|
|
|
1bdc94 |
|