X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=block%2Fblk-merge.c;h=5efc9e7a68b777fe42cc53b2a7bf3add00adff2a;hb=5e0115e500fe9dd2ca11e6f92db9123204f1327a;hp=651136aae76e45ba821205a830a919a3d6d105c5;hpb=6aa5fc434958d15a4d66d922d0416dfb03c07def;p=linux-2.6

diff --git a/block/blk-merge.c b/block/blk-merge.c
index 651136aae7..5efc9e7a68 100644
--- a/block/blk-merge.c
+++ b/block/blk-merge.c
@@ -441,6 +441,9 @@ static int attempt_merge(struct request_queue *q, struct request *req,
 	    || next->special)
 		return 0;
 
+	if (blk_integrity_rq(req) != blk_integrity_rq(next))
+		return 0;
+
 	/*
 	 * If we are allowed to merge, then append bio list
 	 * from next to rq and release next. merge_requests_fn