aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
authorJosef Bacik <jbacik@fb.com>2016-09-21 16:55:31 -0400
committerJens Axboe <axboe@fb.com>2016-09-23 11:46:42 -0600
commit005043ac31ba5bf6721b4ddca10ff2066e2ee2fe (patch)
treead5c18ce70dc808202771202ff14da40fce69c23 /drivers/block
parentblkcg: Annotate blkg_hint correctly (diff)
downloadlinux-dev-005043ac31ba5bf6721b4ddca10ff2066e2ee2fe.tar.xz
linux-dev-005043ac31ba5bf6721b4ddca10ff2066e2ee2fe.zip
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>
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/nbd.c2
1 files changed, 1 insertions, 1 deletions
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);