From: Baolin Wang <baolin.wang@linux.alibaba.com>
To: axboe@kernel.dk
Cc: ming.lei@redhat.com, hch@lst.de, baolin.wang@linux.alibaba.com,
baolin.wang7@gmail.com, linux-block@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH 2/5] block: Remove redundant blk_mq_sched_allow_merge() validation
Date: Wed, 29 Jul 2020 11:28:34 +0800 [thread overview]
Message-ID: <6137e782ccc9040bffd61895cc98cd12f2ccd549.1595987955.git.baolin.wang@linux.alibaba.com> (raw)
In-Reply-To: <cover.1595987955.git.baolin.wang@linux.alibaba.com>
In-Reply-To: <cover.1595987955.git.baolin.wang@linux.alibaba.com>
Only software queue and kyber IO scheduler will call blk_mq_bio_list_merge()
to merge a bio, and kyber IO scheduler did not implement the ops->allow_merge().
Thus we can remove the redundant blk_mq_sched_allow_merge() in
blk_mq_bio_list_merge() function.
Signed-off-by: Baolin Wang <baolin.wang@linux.alibaba.com>
---
block/blk-mq-sched.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/block/blk-mq-sched.c b/block/blk-mq-sched.c
index b8db72c..cc34f69 100644
--- a/block/blk-mq-sched.c
+++ b/block/blk-mq-sched.c
@@ -403,14 +403,10 @@ bool blk_mq_bio_list_merge(struct request_queue *q, struct list_head *list,
switch (blk_try_merge(rq, bio)) {
case ELEVATOR_BACK_MERGE:
- if (blk_mq_sched_allow_merge(q, rq, bio))
- merged = bio_attempt_back_merge(rq, bio,
- nr_segs);
+ merged = bio_attempt_back_merge(rq, bio, nr_segs);
break;
case ELEVATOR_FRONT_MERGE:
- if (blk_mq_sched_allow_merge(q, rq, bio))
- merged = bio_attempt_front_merge(rq, bio,
- nr_segs);
+ merged = bio_attempt_front_merge(rq, bio, nr_segs);
break;
case ELEVATOR_DISCARD_MERGE:
merged = bio_attempt_discard_merge(q, rq, bio);
--
1.8.3.1
next prev parent reply other threads:[~2020-07-29 3:28 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-29 3:28 [PATCH 0/5] Some clean-ups for bio merge Baolin Wang
2020-07-29 3:28 ` [PATCH 1/5] block: Move bio merge related functions into blk-merge.c Baolin Wang
2020-07-29 3:28 ` Baolin Wang [this message]
2020-07-29 3:28 ` [PATCH 3/5] block: Add a new helper to attempt to merge a bio Baolin Wang
2020-07-29 3:28 ` [PATCH 4/5] block: Remove blk_mq_attempt_merge() function Baolin Wang
2020-07-29 3:28 ` [PATCH 5/5] block: Remove __blk_mq_sched_bio_merge() helper Baolin Wang
2020-08-11 11:49 ` [PATCH 0/5] Some clean-ups for bio merge Baolin Wang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=6137e782ccc9040bffd61895cc98cd12f2ccd549.1595987955.git.baolin.wang@linux.alibaba.com \
--to=baolin.wang@linux.alibaba.com \
--cc=axboe@kernel.dk \
--cc=baolin.wang7@gmail.com \
--cc=hch@lst.de \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=ming.lei@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).