Commit 4f9c74c6 authored by Ming Lei's avatar Ming Lei Committed by Mike Snitzer
Browse files

dm rq: replace 'bio->bi_vcnt == 1' with !bio_multiple_segments 



Avoid accessing .bi_vcnt directly, because the bio can be split from
block layer and .bi_vcnt should never have been used here.

Signed-off-by: default avatarMing Lei <tom.leiming@gmail.com>
Signed-off-by: default avatarMike Snitzer <snitzer@redhat.com>
parent d15bb3a6

drivers/md/dm-rq.c

+1 −1
Original line number Diff line number Diff line
@@ -825,7 +825,7 @@ static void dm_old_request_fn(struct request_queue *q) 
			pos = blk_rq_pos(rq);



		if ((dm_old_request_peeked_before_merge_deadline(md) &&

		     md_in_flight(md) && rq->bio && rq->bio->bi_vcnt == 1 &&

		     md_in_flight(md) && rq->bio && !bio_multiple_segments(rq->bio) &&

		     md->last_rq_pos == pos && md->last_rq_rw == rq_data_dir(rq)) ||

		    (ti->type->busy && ti->type->busy(ti))) {

			blk_delay_queue(q, 10);