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: 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:
Родитель
6ac45aeb6b
Коммит
e18378a60e
|
@ -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:
|
||||||
|
|
Загрузка…
Ссылка в новой задаче