|
 |
26ba25 |
From e52756f20cebe52713bd13672f1217d637e039f7 Mon Sep 17 00:00:00 2001
|
|
|
26ba25 |
From: John Snow <jsnow@redhat.com>
|
|
|
26ba25 |
Date: Wed, 18 Jul 2018 22:55:09 +0200
|
|
|
26ba25 |
Subject: [PATCH 251/268] nbd/server: fix nbd_co_send_block_status
|
|
|
26ba25 |
|
|
|
26ba25 |
RH-Author: John Snow <jsnow@redhat.com>
|
|
|
26ba25 |
Message-id: <20180718225511.14878-34-jsnow@redhat.com>
|
|
|
26ba25 |
Patchwork-id: 81418
|
|
|
26ba25 |
O-Subject: [RHEL-7.6 qemu-kvm-rhev PATCH 33/35] nbd/server: fix nbd_co_send_block_status
|
|
|
26ba25 |
Bugzilla: 1207657
|
|
|
26ba25 |
RH-Acked-by: Eric Blake <eblake@redhat.com>
|
|
|
26ba25 |
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
26ba25 |
RH-Acked-by: Fam Zheng <famz@redhat.com>
|
|
|
26ba25 |
|
|
|
26ba25 |
From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
|
|
|
26ba25 |
|
|
|
26ba25 |
Call nbd_co_send_extents() with correct length parameter
|
|
|
26ba25 |
(extent.length may be smaller than original length).
|
|
|
26ba25 |
|
|
|
26ba25 |
Also, switch length parameter type to uint32_t, to correspond with
|
|
|
26ba25 |
request->len and similar nbd_co_send_bitmap().
|
|
|
26ba25 |
|
|
|
26ba25 |
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
|
|
|
26ba25 |
Message-Id: <20180704112302.471456-2-vsementsov@virtuozzo.com>
|
|
|
26ba25 |
Signed-off-by: Eric Blake <eblake@redhat.com>
|
|
|
26ba25 |
(cherry picked from commit 0c0eaed14721f8a9db334deb35316411c512059a)
|
|
|
26ba25 |
Signed-off-by: John Snow <jsnow@redhat.com>
|
|
|
26ba25 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
26ba25 |
---
|
|
|
26ba25 |
nbd/server.c | 5 +++--
|
|
|
26ba25 |
1 file changed, 3 insertions(+), 2 deletions(-)
|
|
|
26ba25 |
|
|
|
26ba25 |
diff --git a/nbd/server.c b/nbd/server.c
|
|
|
26ba25 |
index e52b76b..ea5fe0e 100644
|
|
|
26ba25 |
--- a/nbd/server.c
|
|
|
26ba25 |
+++ b/nbd/server.c
|
|
|
26ba25 |
@@ -1910,7 +1910,7 @@ static int nbd_co_send_extents(NBDClient *client, uint64_t handle,
|
|
|
26ba25 |
/* Get block status from the exported device and send it to the client */
|
|
|
26ba25 |
static int nbd_co_send_block_status(NBDClient *client, uint64_t handle,
|
|
|
26ba25 |
BlockDriverState *bs, uint64_t offset,
|
|
|
26ba25 |
- uint64_t length, bool last,
|
|
|
26ba25 |
+ uint32_t length, bool last,
|
|
|
26ba25 |
uint32_t context_id, Error **errp)
|
|
|
26ba25 |
{
|
|
|
26ba25 |
int ret;
|
|
|
26ba25 |
@@ -1922,7 +1922,8 @@ static int nbd_co_send_block_status(NBDClient *client, uint64_t handle,
|
|
|
26ba25 |
client, handle, -ret, "can't get block status", errp);
|
|
|
26ba25 |
}
|
|
|
26ba25 |
|
|
|
26ba25 |
- return nbd_co_send_extents(client, handle, &extent, 1, length, last,
|
|
|
26ba25 |
+ return nbd_co_send_extents(client, handle, &extent, 1,
|
|
|
26ba25 |
+ be32_to_cpu(extent.length), last,
|
|
|
26ba25 |
context_id, errp);
|
|
|
26ba25 |
}
|
|
|
26ba25 |
|
|
|
26ba25 |
--
|
|
|
26ba25 |
1.8.3.1
|
|
|
26ba25 |
|