diff options
| author | Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> | 2018-10-03 17:47:38 +0300 |
|---|---|---|
| committer | Eric Blake <eblake@redhat.com> | 2018-10-03 09:58:43 -0500 |
| commit | 2f454defc23e1be78f2a96bad2877ce7829f61b4 (patch) | |
| tree | ca2b32e433306886a43f615aa175fcd09dd6b2ba | |
| parent | 80c7c2b00d607221bb43815d2c1951d54229b3ee (diff) | |
| download | focaccia-qemu-2f454defc23e1be78f2a96bad2877ce7829f61b4.tar.gz focaccia-qemu-2f454defc23e1be78f2a96bad2877ce7829f61b4.zip | |
nbd/server: fix NBD_CMD_CACHE
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 <vsementsov@virtuozzo.com> CC: qemu-stable@nongnu.org Message-Id: <20181003144738.70670-1-vsementsov@virtuozzo.com> Reviewed-by: Eric Blake <eblake@redhat.com> [eblake: commit message typo fix] Signed-off-by: Eric Blake <eblake@redhat.com>
| -rw-r--r-- | nbd/server.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nbd/server.c b/nbd/server.c index 98d0fa2515..4fb247b116 100644 --- a/nbd/server.c +++ b/nbd/server.c @@ -2177,7 +2177,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); } |