]> git.itanic.dy.fi Git - linux-stable/commitdiff
blk-mq: rename blk_mq_can_use_cached_rq
authorChristoph Hellwig <hch@lst.de>
Thu, 11 Jan 2024 13:57:04 +0000 (14:57 +0100)
committerJens Axboe <axboe@kernel.dk>
Fri, 12 Jan 2024 16:11:34 +0000 (09:11 -0700)
blk_mq_can_use_cached_rq doesn't just check if we can use the request,
but also performs the work to actually use it.  Remove the _can in the
naming, and improve the comment describing the function.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20240111135705.2155518-2-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
block/blk-mq.c

index a4c54c5895a1390f52b67045a494442b20b910c1..f57b86d6de6acf9bf2df260ba0cc4aad59156926 100644 (file)
@@ -2900,8 +2900,11 @@ static struct request *blk_mq_get_new_requests(struct request_queue *q,
        return NULL;
 }
 
-/* return true if this @rq can be used for @bio */
-static bool blk_mq_can_use_cached_rq(struct request *rq, struct blk_plug *plug,
+/*
+ * Check if we can use the passed on request for submitting the passed in bio,
+ * and remove it from the request list if it can be used.
+ */
+static bool blk_mq_use_cached_rq(struct request *rq, struct blk_plug *plug,
                struct bio *bio)
 {
        enum hctx_type type = blk_mq_get_hctx_type(bio->bi_opf);
@@ -2979,7 +2982,7 @@ void blk_mq_submit_bio(struct bio *bio)
                        return;
                if (blk_mq_attempt_bio_merge(q, bio, nr_segs))
                        return;
-               if (blk_mq_can_use_cached_rq(rq, plug, bio))
+               if (blk_mq_use_cached_rq(rq, plug, bio))
                        goto done;
                percpu_ref_get(&q->q_usage_counter);
        } else {