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 4c6dd1a85eade5affc3baff9a2470b7e3d312b45..ccfcfc11399abd98c7cd6cf4f72725a78cd023b9 100644 (file)
--- 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);