block: Remove blk_mq_attempt_merge() function

The small blk_mq_attempt_merge() function is only called by
__blk_mq_sched_bio_merge(), just open code it.

Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Baolin Wang <baolin.wang@linux.alibaba.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/block/blk-mq-sched.c b/block/blk-mq-sched.c
index 94db0c9..205d971 100644 (file)
--- a/block/blk-mq-sched.c
+++ b/block/blk-mq-sched.c
@@ -391,28 +391,6 @@ bool blk_mq_sched_try_merge(struct request_queue *q, struct bio *bio,
 }
 EXPORT_SYMBOL_GPL(blk_mq_sched_try_merge);
 
-/*
- * Reverse check our software queue for entries that we could potentially
- * merge with. Currently includes a hand-wavy stop count of 8, to not spend
- * too much time checking for merges.
- */
-static bool blk_mq_attempt_merge(struct request_queue *q,
-                                struct blk_mq_hw_ctx *hctx,
-                                struct blk_mq_ctx *ctx, struct bio *bio,
-                                unsigned int nr_segs)
-{
-       enum hctx_type type = hctx->type;
-
-       lockdep_assert_held(&ctx->lock);
-
-       if (blk_bio_list_merge(q, &ctx->rq_lists[type], bio, nr_segs)) {
-               ctx->rq_merged++;
-               return true;
-       }
-
-       return false;
-}
-
 bool __blk_mq_sched_bio_merge(struct request_queue *q, struct bio *bio,
                unsigned int nr_segs)
 {
@@ -426,14 +404,24 @@ bool __blk_mq_sched_bio_merge(struct request_queue *q, struct bio *bio,
                return e->type->ops.bio_merge(hctx, bio, nr_segs);
 
        type = hctx->type;
-       if ((hctx->flags & BLK_MQ_F_SHOULD_MERGE) &&
-                       !list_empty_careful(&ctx->rq_lists[type])) {
-               /* default per sw-queue merge */
-               spin_lock(&ctx->lock);
-               ret = blk_mq_attempt_merge(q, hctx, ctx, bio, nr_segs);
-               spin_unlock(&ctx->lock);
+       if (!(hctx->flags & BLK_MQ_F_SHOULD_MERGE) ||
+           list_empty_careful(&ctx->rq_lists[type]))
+               return false;
+
+       /* default per sw-queue merge */
+       spin_lock(&ctx->lock);
+       /*
+        * Reverse check our software queue for entries that we could
+        * potentially merge with. Currently includes a hand-wavy stop
+        * count of 8, to not spend too much time checking for merges.
+        */
+       if (blk_bio_list_merge(q, &ctx->rq_lists[type], bio, nr_segs)) {
+               ctx->rq_merged++;
+               ret = true;
        }
 
+       spin_unlock(&ctx->lock);
+
        return ret;
 }