]> err.no Git - linux-2.6/commitdiff
[BLOCK] elevator init fixes #2
authorZachary Amsden <zach@vmware.com>
Wed, 9 Nov 2005 12:24:20 +0000 (13:24 +0100)
committerJens Axboe <axboe@nelson.home.kernel.dk>
Sat, 12 Nov 2005 09:55:05 +0000 (10:55 +0100)
In addition to the first patch, which is probably goodness, I found the
cause of my panic - applying this patch fixes it and now I am booting.
If the chosen_elevator[] is not found, fall back to noop.

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jens Axboe <axboe@suse.de>
block/elevator.c

index 23cfbe528be133608597b5da026dc6a9a400011f..e58928e809ea2094eaea19d32f31d2a0629f0792 100644 (file)
@@ -155,9 +155,10 @@ static void elevator_setup_default(void)
        /*
         * If the given scheduler is not available, fall back to no-op.
         */
-       if (!(e = elevator_find(chosen_elevator)))
+       if ((e = elevator_find(chosen_elevator)))
+               elevator_put(e);
+       else
                strcpy(chosen_elevator, "noop");
-       elevator_put(e);
 }
 
 static int __init elevator_setup(char *str)