]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
blk-mq: remove useless checkings in blk_mq_update_nr_requests()
authorYu Kuai <yukuai3@huawei.com>
Wed, 10 Sep 2025 08:04:37 +0000 (16:04 +0800)
committerJens Axboe <axboe@kernel.dk>
Wed, 10 Sep 2025 11:25:56 +0000 (05:25 -0600)
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>
block/blk-mq.c

index 31cc743ffad788fa77a02f01f6b7b867ad2ee68c..55ccc9f4435d9d024404cc72f9c584b38bceb4e9 100644 (file)
@@ -4930,21 +4930,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;