Skip to content

Commit

Permalink
[PATCH] elevator=as back-compatibility
Browse files Browse the repository at this point in the history
As of 2.6.15 you need to use "anticipatory" instead of "as".  Fix that up
so that `elevator=as' still works.

Signed-off-by: Chuck Ebbert <76306.1226@compuserve.com>
Cc: Nick Piggin <nickpiggin@yahoo.com.au>
Cc: Jens Axboe <axboe@suse.de>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Chuck Ebbert authored and Linus Torvalds committed Jan 17, 2006
1 parent 5aeebe0 commit 4c26458
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions block/elevator.c
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,13 @@ static void elevator_setup_default(void)
if (!chosen_elevator[0])
strcpy(chosen_elevator, CONFIG_DEFAULT_IOSCHED);

/*
* Be backwards-compatible with previous kernels, so users
* won't get the wrong elevator.
*/
if (!strcmp(chosen_elevator, "as"))
strcpy(chosen_elevator, "anticipatory");

/*
* If the given scheduler is not available, fall back to no-op.
*/
Expand Down

0 comments on commit 4c26458

Please sign in to comment.