Changeset
nbd/common.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Test passed: FreeBSD

loading

Test passed: s390x

loading

Test passed: checkpatch

loading

Test passed: docker

loading

Git apply log
Switched to a new branch '20170811015749.20365-1-eblake@redhat.com'
Applying: nbd: Fix trace message for disconnect
To https://github.com/patchew-project/qemu
 + dc5bcfe5ab...878a13ae09 patchew/20170811015749.20365-1-eblake@redhat.com -> patchew/20170811015749.20365-1-eblake@redhat.com (forced update)
[Qemu-devel] [PATCH] nbd: Fix trace message for disconnect
Posted by Eric Blake, 9 weeks ago
NBD_CMD_DISC is a disconnect request, not a data discard request.

Signed-off-by: Eric Blake <eblake@redhat.com>
---

Although this is not 2.10 material in isolation (it is only a
bad trace message), I don't mind including it in a larger pull
request; I'm still planning to fix the issue of a client hanging
on a malicious server in time for -rc3 (whether via Vladimir's
patch or a smaller one that I'm testing locally).

 nbd/common.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nbd/common.c b/nbd/common.c
index a2f28f2eec..e288d1b972 100644
--- a/nbd/common.c
+++ b/nbd/common.c
@@ -182,7 +182,7 @@ const char *nbd_cmd_lookup(uint16_t cmd)
     case NBD_CMD_WRITE:
         return "write";
     case NBD_CMD_DISC:
-        return "discard";
+        return "disconnect";
     case NBD_CMD_FLUSH:
         return "flush";
     case NBD_CMD_TRIM:
-- 
2.13.4


Re: [Qemu-devel] [Qemu-block] [PATCH] nbd: Fix trace message for disconnect
Posted by Stefan Hajnoczi, 9 weeks ago
On Thu, Aug 10, 2017 at 08:57:48PM -0500, Eric Blake wrote:
> NBD_CMD_DISC is a disconnect request, not a data discard request.
> 
> Signed-off-by: Eric Blake <eblake@redhat.com>
> ---
> 
> Although this is not 2.10 material in isolation (it is only a
> bad trace message), I don't mind including it in a larger pull
> request; I'm still planning to fix the issue of a client hanging
> on a malicious server in time for -rc3 (whether via Vladimir's
> patch or a smaller one that I'm testing locally).
> 
>  nbd/common.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>