diff options
| author | Peter Zijlstra <peterz@infradead.org> | 2020-07-02 15:51:48 +0200 |
|---|---|---|
| committer | Peter Zijlstra <peterz@infradead.org> | 2020-07-02 15:51:48 +0200 |
| commit | 78c2141b654375079e3737f06f19cabfc0fcecd7 (patch) | |
| tree | 5068a6c2904d93b61b37243ea39b728fe621196e /block/blk-mq.c | |
| parent | bb42b3d39781d7fcd3be7f9f9bf11b6661b5fdf1 (diff) | |
| parent | e1ad1ac2deb8f90af9f12ff316989dd5675dec11 (diff) | |
Merge branch 'perf/vlbr'
Diffstat (limited to 'block/blk-mq.c')
| -rw-r--r-- | block/blk-mq.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/block/blk-mq.c b/block/blk-mq.c index 4f57d27bfa73..a9aa6d1e44cf 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -3479,7 +3479,9 @@ static void __blk_mq_update_nr_hw_queues(struct blk_mq_tag_set *set, if (set->nr_maps == 1 && nr_hw_queues > nr_cpu_ids) nr_hw_queues = nr_cpu_ids; - if (nr_hw_queues < 1 || nr_hw_queues == set->nr_hw_queues) + if (nr_hw_queues < 1) + return; + if (set->nr_maps == 1 && nr_hw_queues == set->nr_hw_queues) return; list_for_each_entry(q, &set->tag_list, tag_set_list) |