Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e18378a6 authored by Ming Lei's avatar Ming Lei Committed by Jens Axboe
Browse files

blk-mq: check bio_mergeable() early before merging



It isn't necessary to try to merge the bio which is marked
as NOMERGE.

Reviewed-by: default avatarJeff Moyer <jmoyer@redhat.com>
Signed-off-by: default avatarMing Lei <ming.lei@canonical.com>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 6ac45aeb
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -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: