aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block/null_blk.c
diff options
context:
space:
mode:
authorweiping zhang <zhangweiping@didichuxing.com>2017-08-03 00:26:39 +0800
committerJens Axboe <axboe@kernel.dk>2017-08-07 15:15:37 -0600
commit558ab300c8f2e8843cbd2f30b358815b01b790e1 (patch)
treea76fd86e1cc547eb7b8ef8d45d1b7488d207c59a /drivers/block/null_blk.c
parentblock: Add comment to submit_bio_wait() (diff)
downloadlinux-dev-558ab300c8f2e8843cbd2f30b358815b01b790e1.tar.xz
linux-dev-558ab300c8f2e8843cbd2f30b358815b01b790e1.zip
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>
Diffstat (limited to 'drivers/block/null_blk.c')
-rw-r--r--drivers/block/null_blk.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/block/null_blk.c b/drivers/block/null_blk.c
index 85c24cace973..72e2bc5017d4 100644
--- 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;
}