Ming Lei <[email protected]> writes: > It isn't necessary to try to merge the bio which is marked > as NOMERGE. > > Signed-off-by: Ming Lei <[email protected]>
Reviewed-by: Jeff Moyer <[email protected]> > --- > 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: -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
