X-Git-Url: http://git.cascardo.info/?a=blobdiff_plain;f=block%2Felevator.c;h=6f2375339a996a794c17c96d0f32aa724fd1fae2;hb=da8120355e80ddaf534adb8ed910871d97512d56;hp=ca861927ba41b2dfc9ff80c139f6c8cc162fc251;hpb=57599cc997b81a7c4f764693a7316886a72067fe;p=cascardo%2Flinux.git

diff --git a/block/elevator.c b/block/elevator.c
index ca861927ba41..6f2375339a99 100644
--- a/block/elevator.c
+++ b/block/elevator.c
@@ -100,6 +100,14 @@ int elv_rq_merge_ok(struct request *rq, struct bio *bio)
 	if (bio_integrity(bio) != blk_integrity_rq(rq))
 		return 0;
 
+	/*
+	 * Don't merge if failfast settings don't match
+	 */
+	if (bio_failfast_dev(bio)	!= blk_failfast_dev(rq)		||
+	    bio_failfast_transport(bio)	!= blk_failfast_transport(rq)	||
+	    bio_failfast_driver(bio)	!= blk_failfast_driver(rq))
+		return 0;
+
 	if (!elv_iosched_allow_merge(rq, bio))
 		return 0;