X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;f=block%2Felevator.c;h=c3555c9c672f94c1f13c3cd3c75c037e7c8110a7;hb=6d22adc5246d66f6fee3ead7b042fa075b7811d2;hp=84d63943f2de2f386ff35e6a395f68ada173b5b2;hpb=e162b219ae6a64be353f254bd4ba1c9627c67749;p=karo-tx-linux.git

diff --git a/block/elevator.c b/block/elevator.c
index 84d63943f2de..c3555c9c672f 100644
--- a/block/elevator.c
+++ b/block/elevator.c
@@ -420,7 +420,7 @@ int elv_merge(struct request_queue *q, struct request **req, struct bio *bio)
 	 * 	noxmerges: Only simple one-hit cache try
 	 * 	merges:	   All merge tries attempted
 	 */
-	if (blk_queue_nomerges(q))
+	if (blk_queue_nomerges(q) || !bio_mergeable(bio))
 		return ELEVATOR_NO_MERGE;
 
 	/*