This patch introduces one function __blk_mq_try_merge() which will be resued for bio merge to sw queue in the following patch.
No functional change. Signed-off-by: Ming Lei <[email protected]> --- block/blk-mq-sched.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/block/blk-mq-sched.c b/block/blk-mq-sched.c index b11f53d1e1f3..7fb7949ed7ce 100644 --- a/block/blk-mq-sched.c +++ b/block/blk-mq-sched.c @@ -214,12 +214,13 @@ void blk_mq_sched_dispatch_requests(struct blk_mq_hw_ctx *hctx) } } -bool blk_mq_sched_try_merge(struct request_queue *q, struct bio *bio, - struct request **merged_request) +static inline bool __blk_mq_try_merge(struct request_queue *q, + struct bio *bio, struct request **merged_request, + struct request *candidate, enum elv_merge type) { - struct request *rq; + struct request *rq = candidate; - switch (elv_merge(q, &rq, bio)) { + switch (type) { case ELEVATOR_BACK_MERGE: if (!blk_mq_sched_allow_merge(q, rq, bio)) return false; @@ -242,6 +243,15 @@ bool blk_mq_sched_try_merge(struct request_queue *q, struct bio *bio, return false; } } + +bool blk_mq_sched_try_merge(struct request_queue *q, struct bio *bio, + struct request **merged_request) +{ + struct request *rq; + enum elv_merge type = elv_merge(q, &rq, bio); + + return __blk_mq_try_merge(q, bio, merged_request, rq, type); +} EXPORT_SYMBOL_GPL(blk_mq_sched_try_merge); /* -- 2.9.4
