openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[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>
This commit is contained in:
Zachary Amsden 2005-11-09 13:24:20 +01:00 committed by Jens Axboe
parent b8ea2cb512
commit cff3ba2204
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
block/elevator.c
View File

@ -155,9 +155,10 @@ static void elevator_setup_default(void)
/* /*
* If the given scheduler is not available, fall back to no-op. * 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"); strcpy(chosen_elevator, "noop");
elevator_put(e);
} }
static int __init elevator_setup(char *str) static int __init elevator_setup(char *str)