Commit cff3ba22 authored Nov 09, 2005 by Zachary Amsden Committed by Jens Axboe Nov 12, 2005

[BLOCK] elevator init fixes #2



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>

parent b8ea2cb5

block/elevator.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -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)))
		strcpy(chosen_elevator, "noop");
		if ((e = elevator_find(chosen_elevator)))
		elevator_put(e);
		else
		strcpy(chosen_elevator, "noop");
		}

		static int __init elevator_setup(char *str)