X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=block%2Fblk-merge.c;fp=block%2Fblk-merge.c;h=a504891092052f2494148ef9025f223bca3766e9;hb=155d33d14b1cb6466f9a2838eace4fee335b4e84;hp=5a0cc8550fe6e6b74933c7598cb8d9f3fd8f8587;hpb=409a4065f0ba1806d058ff1c201619cdfb4d18c4;p=mirror_ubuntu-bionic-kernel.git

diff --git a/block/blk-merge.c b/block/blk-merge.c
index 5a0cc8550fe6..a50489109205 100644
--- a/block/blk-merge.c
+++ b/block/blk-merge.c
@@ -300,13 +300,7 @@ void blk_recalc_rq_segments(struct request *rq)
 
 void blk_recount_segments(struct request_queue *q, struct bio *bio)
 {
-	unsigned short seg_cnt;
-
-	/* estimate segment number by bi_vcnt for non-cloned bio */
-	if (bio_flagged(bio, BIO_CLONED))
-		seg_cnt = bio_segments(bio);
-	else
-		seg_cnt = bio->bi_vcnt;
+	unsigned short seg_cnt = bio_segments(bio);
 
 	if (test_bit(QUEUE_FLAG_NO_SG_MERGE, &q->queue_flags) &&
 			(seg_cnt < queue_max_segments(q)))