X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;ds=sidebyside;f=block%2Felevator.c;h=ac5310ef8270984e32799e0524917abf4246853a;hb=ac9fafa1243640349aa481adf473db283a695766;hp=7253fa05db0a202a020cc8d57759c038bc890d22;hpb=d7e3c3249ef23b4617393c69fe464765b4ff1645;p=safe%2Fjmp%2Flinux-2.6

diff --git a/block/elevator.c b/block/elevator.c
index 7253fa0..ac5310e 100644
--- a/block/elevator.c
+++ b/block/elevator.c
@@ -488,6 +488,9 @@ int elv_merge(struct request_queue *q, struct request **req, struct bio *bio)
 		}
 	}
 
+	if (blk_queue_nomerges(q))
+		return ELEVATOR_NO_MERGE;
+
 	/*
 	 * See if our hash lookup can find a potential backmerge.
 	 */