X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=block%2Fbio-integrity.c;h=14b8faf8b09d48937985713e10ed25745aad2dc2;hb=606bb5e0b28b540685fb94c22902cd9a948a3779;hp=4aecca79374adefb7d9496957788f9f376aa095f;hpb=dab3c3cc4f44273ccf2d7ff57c0a4f5bd45c0528;p=firefly-linux-kernel-4.4.55.git

diff --git a/block/bio-integrity.c b/block/bio-integrity.c
index 4aecca79374a..14b8faf8b09d 100644
--- a/block/bio-integrity.c
+++ b/block/bio-integrity.c
@@ -140,6 +140,11 @@ int bio_integrity_add_page(struct bio *bio, struct page *page,
 
 	iv = bip->bip_vec + bip->bip_vcnt;
 
+	if (bip->bip_vcnt &&
+	    bvec_gap_to_prev(bdev_get_queue(bio->bi_bdev),
+			     &bip->bip_vec[bip->bip_vcnt - 1], offset))
+		return 0;
+
 	iv->bv_page = page;
 	iv->bv_len = len;
 	iv->bv_offset = offset;