diff options
| author | Yu Kuai <yukuai3@huawei.com> | 2025-09-10 16:04:37 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-10-15 12:03:28 +0200 |
| commit | 5ae84131b0fee48dcd49d8a1f73e9d8f837d429f (patch) | |
| tree | 68e8f13ce2f22c328d772387bf193e289a87fcd8 /block/blk-mq.c | |
| parent | fa6a3dd139d2b4db53e421d59bf2ebb98a5d70b8 (diff) | |
| download | linux-5ae84131b0fee48dcd49d8a1f73e9d8f837d429f.tar.gz linux-5ae84131b0fee48dcd49d8a1f73e9d8f837d429f.tar.bz2 linux-5ae84131b0fee48dcd49d8a1f73e9d8f837d429f.zip | |
blk-mq: remove useless checkings in blk_mq_update_nr_requests()
[ Upstream commit 8bd7195fea6d9662aa3b32498a3828bfd9b63185 ]
1) queue_requests_store() is the only caller of
blk_mq_update_nr_requests(), where queue is already freezed, no need to
check mq_freeze_depth;
2) q->tag_set must be set for request based device, and queue_is_mq() is
already checked in blk_mq_queue_attr_visible(), no need to check
q->tag_set.
Signed-off-by: Yu Kuai <yukuai3@huawei.com>
Reviewed-by: Nilay Shroff <nilay@linux.ibm.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Stable-dep-of: b86433721f46 ("blk-mq: fix potential deadlock while nr_requests grown")
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'block/blk-mq.c')
| -rw-r--r-- | block/blk-mq.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/block/blk-mq.c b/block/blk-mq.c index 19b50110376c..f5e713224d81 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -4929,21 +4929,14 @@ int blk_mq_update_nr_requests(struct request_queue *q, unsigned int nr) { struct blk_mq_tag_set *set = q->tag_set; struct blk_mq_hw_ctx *hctx; - int ret; + int ret = 0; unsigned long i; - if (WARN_ON_ONCE(!q->mq_freeze_depth)) - return -EINVAL; - - if (!set) - return -EINVAL; - if (q->nr_requests == nr) return 0; blk_mq_quiesce_queue(q); - ret = 0; queue_for_each_hw_ctx(q, hctx, i) { if (!hctx->tags) continue; |