Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1742607

[PATCH V5 7/8] blk-mq-sched: refactor blk_mq_sched_try_merge()

Show all headers | View raw

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.

Tested-by: Oleksandr Natalenko <oleksandr@natalenko.name>
Tested-by: Tom Nguyen <tom81094@gmail.com>
Tested-by: Paolo Valente <paolo.valente@linaro.org>
Reviewed-by: Bart Van Assche <bart.vanassche@wdc.com>
Signed-off-by: Ming Lei <ming.lei@redhat.com>
---
 block/blk-mq-sched.c | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/block/blk-mq-sched.c b/block/blk-mq-sched.c
index 8c09959bc0d0..a58f4746317c 100644
--- a/block/blk-mq-sched.c
+++ b/block/blk-mq-sched.c
@@ -222,12 +222,11 @@ 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 bool __blk_mq_try_merge(struct request_queue *q,
+		struct bio *bio, struct request **merged_request,
+		struct request *rq, enum elv_merge type)
 {
-	struct request *rq;
-
-	switch (elv_merge(q, &rq, bio)) {
+	switch (type) {
 	case ELEVATOR_BACK_MERGE:
 		if (!blk_mq_sched_allow_merge(q, rq, bio))
 			return false;
@@ -250,6 +249,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.5

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH V5 0/8] blk-mq: improve bio merge for none scheduler Ming Lei <ming.lei@redhat.com> - 2017-09-30 13:30 +0200
  [PATCH V5 7/8] blk-mq-sched: refactor blk_mq_sched_try_merge() Ming Lei <ming.lei@redhat.com> - 2017-09-30 13:40 +0200
  [PATCH V5 5/8] block: add check on elevator for supporting bio merge via hashtable from blk-mq sw queue Ming Lei <ming.lei@redhat.com> - 2017-09-30 13:40 +0200
  [PATCH V5 2/8] blk-mq-sched: use q->queue_depth as hint for q->nr_requests Ming Lei <ming.lei@redhat.com> - 2017-09-30 13:40 +0200
  [PATCH V5 8/8] blk-mq: improve bio merge from blk-mq sw queue Ming Lei <ming.lei@redhat.com> - 2017-09-30 13:40 +0200
  [PATCH V5 4/8] block: move actual bio merge code into __elv_merge Ming Lei <ming.lei@redhat.com> - 2017-09-30 13:40 +0200
  [PATCH V5 1/8] blk-mq-sched: introduce blk_mq_sched_queue_depth() Ming Lei <ming.lei@redhat.com> - 2017-09-30 13:40 +0200
  [PATCH V5 3/8] block: introduce rqhash helpers Ming Lei <ming.lei@redhat.com> - 2017-09-30 13:40 +0200
  [PATCH V5 6/8] block: introduce .last_merge and .hash to blk_mq_ctx Ming Lei <ming.lei@redhat.com> - 2017-09-30 13:40 +0200

csiph-web