null_blk: simplify logic for use_per_node_hctx

make sure submit_queues equal nr_online_nodes.

Signed-off-by: weiping zhang <zhangweiping@didichuxing.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/drivers/block/null_blk.c b/drivers/block/null_blk.c
index 85c24ca..72e2bc5 100644 (file)
--- a/drivers/block/null_blk.c
+++ b/drivers/block/null_blk.c
@@ -733,9 +733,6 @@ static int null_add_dev(void)
 
        spin_lock_init(&nullb->lock);
 
-       if (queue_mode == NULL_Q_MQ && use_per_node_hctx)
-               submit_queues = nr_online_nodes;
-
        rv = setup_queues(nullb);
        if (rv)
                goto out_free_nullb;
@@ -845,8 +842,8 @@ static int __init null_init(void)
        }
 
        if (queue_mode == NULL_Q_MQ && use_per_node_hctx) {
-               if (submit_queues < nr_online_nodes) {
-                       pr_warn("null_blk: submit_queues param is set to %u.",
+               if (submit_queues != nr_online_nodes) {
+                       pr_warn("null_blk: submit_queues param is set to %u.\n",
                                                        nr_online_nodes);
                        submit_queues = nr_online_nodes;
                }