[PATCH] timeout thing

[Josef Bacik]

---
 drivers/block/nbd.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index 526389351784..ab365c0e9c04 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -1314,7 +1314,10 @@ static void nbd_config_put(struct nbd_device *nbd)
 		kfree(nbd->config);
 		nbd->config = NULL;
 
-		nbd->tag_set.timeout = 0;
+		/* Reset our timeout to something sane. */
+		nbd->tag_set.timeout = 30 * HZ;
+		blk_queue_rq_timeout(nbd->disk->queue, 30 * HZ);
+
 		nbd->disk->queue->limits.discard_granularity = 0;
 		nbd->disk->queue->limits.discard_alignment = 0;
 		blk_queue_max_discard_sectors(nbd->disk->queue, 0);
-- 
2.26.3