From: Josef Bacik <jbacik@fb.com>
Date: Wed, 21 Sep 2016 20:55:31 +0000 (-0400)
Subject: nbd: use BLK_MQ_F_BLOCKING
X-Git-Tag: v4.9-rc1~87^2~9
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=005043ac31ba5bf6721b4ddca10ff2066e2ee2fe;p=linux-2.6-block.git

nbd: use BLK_MQ_F_BLOCKING

We take a mutex when sending commands and send stuff over the network, we need
to have queue_rq called asynchronously.

Signed-off-by: Josef Bacik <jbacik@fb.com>
Fixes: fd8383fd88a2 ("nbd: convert to blkmq")
Signed-off-by: Jens Axboe <axboe@fb.com>
---

diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index 4c6dd1a85ead..ccfcfc11399a 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -941,7 +941,7 @@ static int __init nbd_init(void)
 		nbd_dev[i].tag_set.numa_node = NUMA_NO_NODE;
 		nbd_dev[i].tag_set.cmd_size = sizeof(struct nbd_cmd);
 		nbd_dev[i].tag_set.flags = BLK_MQ_F_SHOULD_MERGE |
-			BLK_MQ_F_SG_MERGE;
+			BLK_MQ_F_SG_MERGE | BLK_MQ_F_BLOCKING;
 		nbd_dev[i].tag_set.driver_data = &nbd_dev[i];
 
 		err = blk_mq_alloc_tag_set(&nbd_dev[i].tag_set);