block: Skip I/O merges when disabled

[safe/jmp/linux-2.6] / block / elevator.c

diff --git a/block/elevator.c b/block/elevator.c
index 7253fa0..ac5310e 100644 (file)
--- 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.
         */