From 6f7c9c8f16b2f5d97fd01a1b72028283ef9bdaed Mon Sep 17 00:00:00 2001
From: Tejun Heo <tj@kernel.org>
Date: Thu, 7 May 2009 22:24:35 +0900
Subject: [PATCH] --- yaml --- r: 147001 b: refs/heads/master c:
 53d6979ab6747e758207e8ac861b96d0da0d3332 h: refs/heads/master i:   146999:
 9e1c413405aefd0721c7adcae7b7c44bfa8d651c v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/block/nbd.c | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 6531ecb47d84..8b404a298946 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f68adec3c7155a8bbf32a90cb4c4d0737df045d9
+refs/heads/master: 53d6979ab6747e758207e8ac861b96d0da0d3332
diff --git a/trunk/drivers/block/nbd.c b/trunk/drivers/block/nbd.c
index 4d6de4f15ccb..a9ab8be9d92f 100644
--- a/trunk/drivers/block/nbd.c
+++ b/trunk/drivers/block/nbd.c
@@ -580,13 +580,6 @@ static int __nbd_ioctl(struct block_device *bdev, struct nbd_device *lo,
 		blk_rq_init(NULL, &sreq);
 		sreq.cmd_type = REQ_TYPE_SPECIAL;
 		nbd_cmd(&sreq) = NBD_CMD_DISC;
-		/*
-		 * Set these to sane values in case server implementation
-		 * fails to check the request type first and also to keep
-		 * debugging output cleaner.
-		 */
-		sreq.sector = 0;
-		sreq.nr_sectors = 0;
 		if (!lo->sock)
 			return -EINVAL;
 		nbd_send_req(lo, &sreq);