From bcb4f411c23e114f7c77c0858d7f78f50fda68e9 Mon Sep 17 00:00:00 2001 From: Ming Lei Date: Mon, 10 Nov 2014 20:10:24 +0800 Subject: [PATCH] block/blk-merge: fix blk_recount_segments bio->bi_phys_segments should be used for deciding if merge is needed instead of bio->vcnt which isn't valid for cloned bio. Signed-off-by: Ming Lei --- block/blk-merge.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/block/blk-merge.c b/block/blk-merge.c index b3ac40a..3387fd6 100644 --- a/block/blk-merge.c +++ b/block/blk-merge.c @@ -99,7 +99,7 @@ void blk_recount_segments(struct request_queue *q, struct bio *bio) { bool no_sg_merge = !!test_bit(QUEUE_FLAG_NO_SG_MERGE, &q->queue_flags); - bool merge_not_need = bio->bi_vcnt < queue_max_segments(q); + bool merge_not_need = bio->bi_phys_segments < queue_max_segments(q); if (no_sg_merge && !bio_flagged(bio, BIO_CLONED) && merge_not_need) -- 1.7.9.5