From: Josef Bacik <jbacik@fb.com>
Date: Fri, 24 Mar 2017 18:08:28 +0000 (-0400)
Subject: nbd: set queue timeout properly
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f8586855031a1d6b243f013c3082631346fddfad;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

nbd: set queue timeout properly

We can't just set the timeout on the tagset, we have to set it on the
queue as it would have been setup already at this point.

Signed-off-by: Josef Bacik <jbacik@fb.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
---

diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index dbc22f4bed3d..b0003dab90b9 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -844,7 +844,10 @@ static int __nbd_ioctl(struct block_device *bdev, struct nbd_device *nbd,
 		nbd_size_set(nbd, bdev, nbd->blksize, arg);
 		return 0;
 	case NBD_SET_TIMEOUT:
-		nbd->tag_set.timeout = arg * HZ;
+		if (arg) {
+			nbd->tag_set.timeout = arg * HZ;
+			blk_queue_rq_timeout(nbd->disk->queue, arg * HZ);
+		}
 		return 0;
 
 	case NBD_SET_FLAGS: