X-Git-Url: http://git.monstr.eu/?a=blobdiff_plain;f=block%2Fblk-integrity.c;h=75f29cf701889a5711cad9e63f041bd98c74022f;hb=90a835f5d19217ad1e174e40ef35d0acf3357828;hp=f548b64be09242a77f7db6ac7cedd5f68ee397b7;hpb=a732cd437be58500214e617fbbf8a0fdc32ce226;p=linux-2.6-microblaze.git

diff --git a/block/blk-integrity.c b/block/blk-integrity.c
index f548b64be092..75f29cf70188 100644
--- a/block/blk-integrity.c
+++ b/block/blk-integrity.c
@@ -204,6 +204,9 @@ bool blk_integrity_merge_rq(struct request_queue *q, struct request *req,
 	    q->limits.max_integrity_segments)
 		return false;
 
+	if (integrity_req_gap_back_merge(req, next->bio))
+		return false;
+
 	return true;
 }
 EXPORT_SYMBOL(blk_integrity_merge_rq);