diff options
| author | Joel Stanley <joel@jms.id.au> | 2020-07-22 12:42:41 +0300 |
|---|---|---|
| committer | Joel Stanley <joel@jms.id.au> | 2020-07-22 12:42:46 +0300 |
| commit | 8a9b346382056b52cd7ff141ae9f15a0fcfeb13d (patch) | |
| tree | 7b855ed138c412bc27713ea8d3feef8939c954a0 /block/blk-mq.c | |
| parent | 2b4829edfc1c225c717652153097470529d171db (diff) | |
| parent | d811d29517d1ea05bc159579231652d3ca1c2a01 (diff) | |
| download | linux-8a9b346382056b52cd7ff141ae9f15a0fcfeb13d.tar.xz | |
Merge tag 'v5.4.53' into dev-5.4
This is the 5.4.53 stable release
Signed-off-by: Joel Stanley <joel@jms.id.au>
Diffstat (limited to 'block/blk-mq.c')
| -rw-r--r-- | block/blk-mq.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/block/blk-mq.c b/block/blk-mq.c index 0550366e25d8..ae7d31cb5a4e 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -829,10 +829,10 @@ static bool blk_mq_rq_inflight(struct blk_mq_hw_ctx *hctx, struct request *rq, void *priv, bool reserved) { /* - * If we find a request that is inflight and the queue matches, + * If we find a request that isn't idle and the queue matches, * we know the queue is busy. Return false to stop the iteration. */ - if (rq->state == MQ_RQ_IN_FLIGHT && rq->q == hctx->queue) { + if (blk_mq_request_started(rq) && rq->q == hctx->queue) { bool *busy = priv; *busy = true; @@ -3279,7 +3279,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) |