Subject: [merged] nbd-zero-from-and-len-fields-in-nbd_cmd_disconnect.patch removed from -mm tree
To: kroosec@xxxxxxxxx,Paul.Clements@xxxxxxxxxxxx,hani@xxxxxxxxx,paul.clements@xxxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Mon, 09 Jun 2014 12:41:41 -0700
The patch titled
Subject: nbd: zero from and len fields in NBD_CMD_DISCONNECT.
has been removed from the -mm tree. Its filename was
nbd-zero-from-and-len-fields-in-nbd_cmd_disconnect.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Hani Benhabiles <kroosec@xxxxxxxxx>
Subject: nbd: zero from and len fields in NBD_CMD_DISCONNECT.
Len field is already set to zero, but not the from field which is sent as
0xfffffffffffffe00. This makes no sense, and may cause confuse server
implementations doing sanity checks (qemu-nbd is an example.)
Signed-off-by: Hani Benhabiles <hani@xxxxxxxxx>
Cc: Paul Clements <paul.clements@xxxxxxxxxxx>
Cc: Paul Clements <Paul.Clements@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/block/nbd.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff -puN drivers/block/nbd.c~nbd-zero-from-and-len-fields-in-nbd_cmd_disconnect drivers/block/nbd.c
--- a/drivers/block/nbd.c~nbd-zero-from-and-len-fields-in-nbd_cmd_disconnect
+++ a/drivers/block/nbd.c
@@ -243,14 +243,11 @@ static int nbd_send_req(struct nbd_devic
struct nbd_request request;
unsigned long size = blk_rq_bytes(req);
+ memset(&request, 0, sizeof(request));
request.magic = htonl(NBD_REQUEST_MAGIC);
request.type = htonl(nbd_cmd(req));
- if (nbd_cmd(req) == NBD_CMD_FLUSH) {
- /* Other values are reserved for FLUSH requests. */
- request.from = 0;
- request.len = 0;
- } else {
+ if (nbd_cmd(req) != NBD_CMD_FLUSH && nbd_cmd(req) != NBD_CMD_DISC) {
request.from = cpu_to_be64((u64)blk_rq_pos(req) << 9);
request.len = htonl(size);
}
_
Patches currently in -mm which might be from kroosec@xxxxxxxxx are
origin.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
