kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

blk-mq: check bio_mergeable() early before merging

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

Reviewed-by: Jeff Moyer <jmoyer@redhat.com>
Signed-off-by: Ming Lei <ming.lei@canonical.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
This commit is contained in:
Ming Lei 2015-10-20 23:13:54 +08:00 committed by Jens Axboe
parent 6ac45aeb6b
commit e18378a60e
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
block/blk-mq.c
View file

@ -1140,7 +1140,7 @@ static inline bool blk_mq_merge_queue_io(struct blk_mq_hw_ctx *hctx,
struct blk_mq_ctx *ctx, struct blk_mq_ctx *ctx,
struct request *rq, struct bio *bio) 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); blk_mq_bio_to_request(rq, bio);
spin_lock(&ctx->lock); spin_lock(&ctx->lock);
insert_rq: insert_rq: