X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=block%2Fblk-merge.c;h=e01405a3e8b3f51ce0424a844fadb3304bda5e44;hb=0f0cd472062eca6f9fac8be0cd5585f9a2df1ab2;hp=41a55ba0d78e8a97b5707a9194cce3b6ebd1c811;hpb=d0bc387dbe7f93b5608e1d305a18f50060de69cb;p=firefly-linux-kernel-4.4.55.git

diff --git a/block/blk-merge.c b/block/blk-merge.c
index 41a55ba0d78e..e01405a3e8b3 100644
--- a/block/blk-merge.c
+++ b/block/blk-merge.c
@@ -103,6 +103,9 @@ static struct bio *blk_bio_segment_split(struct request_queue *q,
 			bvprv = bv;
 			bvprvp = &bvprv;
 			sectors += bv.bv_len >> 9;
+
+			if (nsegs == 1 && seg_size > front_seg_size)
+				front_seg_size = seg_size;
 			continue;
 		}
 new_segment: