Merge branch 'for-4.9/block-irq' of git://git.kernel.dk/linux-block

[cascardo/linux.git] / drivers / block / nbd.c

diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index 4c6dd1a..ba405b5 100644 (file)
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -881,7 +881,6 @@ static int nbd_init_request(void *data, struct request *rq,
 
 static struct blk_mq_ops nbd_mq_ops = {
        .queue_rq       = nbd_queue_rq,
-       .map_queue      = blk_mq_map_queue,
        .init_request   = nbd_init_request,
        .timeout        = nbd_xmit_timeout,
 };
@@ -941,7 +940,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);