From: Ming Lei <ming.lei@canonical.com>
To: Jens Axboe <axboe@kernel.dk>, linux-kernel@vger.kernel.org
Cc: Ming Lin <ming.l@ssi.samsung.com>,
Kent Overstreet <kent.overstreet@gmail.com>,
Christoph Hellwig <hch@infradead.org>,
Jeff Moyer <jmoyer@redhat.com>, Ming Lei <ming.lei@canonical.com>
Subject: [PATCH v1 3/6] blk-mq: check bio_mergeable() early before merging
Date: Sat, 17 Oct 2015 23:52:31 +0800 [thread overview]
Message-ID: <1445097154-18229-4-git-send-email-ming.lei@canonical.com> (raw)
In-Reply-To: <1445097154-18229-1-git-send-email-ming.lei@canonical.com>
It isn't necessary to try to merge the bio which is marked
as NOMERGE.
Signed-off-by: Ming Lei <ming.lei@canonical.com>
---
block/blk-mq.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/block/blk-mq.c b/block/blk-mq.c
index 546b3b8..d55d022 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -1140,7 +1140,7 @@ static inline bool blk_mq_merge_queue_io(struct blk_mq_hw_ctx *hctx,
struct blk_mq_ctx *ctx,
struct request *rq, struct bio *bio)
{
- if (!hctx_allow_merges(hctx)) {
+ if (!hctx_allow_merges(hctx) || !bio_mergeable(bio)) {
blk_mq_bio_to_request(rq, bio);
spin_lock(&ctx->lock);
insert_rq:
--
1.9.1
next prev parent reply other threads:[~2015-10-17 15:52 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-17 15:52 [PATCH v1 0/6] block: some misc changes Ming Lei
2015-10-17 15:52 ` [PATCH v1 1/6] block: setup bi_phys_segments after splitting Ming Lei
2015-10-17 15:52 ` [PATCH v1 2/6] block: avoid to merge splitted bio Ming Lei
2015-10-17 15:52 ` Ming Lei [this message]
2015-10-19 15:11 ` [PATCH v1 3/6] blk-mq: check bio_mergeable() early before merging Jeff Moyer
2015-10-17 15:52 ` [PATCH v1 4/6] block: " Ming Lei
2015-10-19 15:27 ` Jeff Moyer
2015-10-19 15:32 ` Ming Lei
2015-10-19 15:46 ` Jeff Moyer
2015-10-17 15:52 ` [PATCH v1 5/6] blk-mq: fix for trace_block_plug() Ming Lei
2015-10-19 15:38 ` Jeff Moyer
2015-10-19 15:58 ` Ming Lei
2015-10-19 17:59 ` Jeff Moyer
2015-10-20 0:38 ` Ming Lei
2015-10-17 15:52 ` [PATCH v1 6/6] blk-mq: mark ctx as pending at batch in flush plug path Ming Lei
2015-10-19 15:57 ` Jeff Moyer
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=1445097154-18229-4-git-send-email-ming.lei@canonical.com \
--to=ming.lei@canonical.com \
--cc=axboe@kernel.dk \
--cc=hch@infradead.org \
--cc=jmoyer@redhat.com \
--cc=kent.overstreet@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=ming.l@ssi.samsung.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
all inboxes | Powered by JetHome®