1 files changed, 8 insertions, 0 deletions

diff --git a/block/blk-merge.c b/block/blk-merge.c
index 9402a7c3ba22..22467f475ab4 100644
--- a/block/blk-merge.c
+++ b/block/blk-merge.c
@@ -277,6 +277,9 @@ static struct bio *blk_bio_segment_split(struct request_queue *q,
                         bvprvp = &bvprv;
                         sectors += bv.bv_len >> 9;
 
+                        if (nsegs == 1 && seg_size > front_seg_size)
+                                front_seg_size = seg_size;
+
                         continue;
                 }
 new_segment:
@@ -401,6 +404,11 @@ static unsigned int __blk_recalc_rq_segments(struct request_queue *q,
 
                                 seg_size += bv.bv_len;
                                 bvprv = bv;
+
+                                if (nr_phys_segs == 1 && seg_size >
+                                                front_seg_size)
+                                        front_seg_size = seg_size;
+
                                 continue;
                         }
 new_segment: