From 290b8b6ab5f9a1f747be698e628c646c7c76b972 Mon Sep 17 00:00:00 2001 From: John Snow Date: Wed, 10 Oct 2018 18:19:23 +0100 Subject: [PATCH 02/49] nbd/server: fix NBD_CMD_CACHE RH-Author: John Snow Message-id: <20181010181924.30470-2-jsnow@redhat.com> Patchwork-id: 82576 O-Subject: [RHEL8/rhel qemu-kvm PATCH 1/2] nbd/server: fix NBD_CMD_CACHE Bugzilla: 1636142 RH-Acked-by: Stefan Hajnoczi RH-Acked-by: Danilo de Paula RH-Acked-by: Thomas Huth From: Vladimir Sementsov-Ogievskiy We should not go to structured-read branch on CACHE command, fix that. Bug introduced in bc37b06a5cde24 "nbd/server: introduce NBD_CMD_CACHE" with the whole feature and affects 3.0.0 release. Signed-off-by: Vladimir Sementsov-Ogievskiy CC: qemu-stable@nongnu.org Message-Id: <20181003144738.70670-1-vsementsov@virtuozzo.com> Reviewed-by: Eric Blake [eblake: commit message typo fix] Signed-off-by: Eric Blake (cherry picked from commit 2f454defc23e1be78f2a96bad2877ce7829f61b4) Signed-off-by: John Snow Signed-off-by: Danilo C. L. de Paula --- nbd/server.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nbd/server.c b/nbd/server.c index ea5fe0e..1ce3f44 100644 --- a/nbd/server.c +++ b/nbd/server.c @@ -2135,7 +2135,8 @@ static coroutine_fn int nbd_do_cmd_read(NBDClient *client, NBDRequest *request, } if (client->structured_reply && !(request->flags & NBD_CMD_FLAG_DF) && - request->len) { + request->len && request->type != NBD_CMD_CACHE) + { return nbd_co_send_sparse_read(client, request->handle, request->from, data, request->len, errp); } -- 1.8.3.1