aboutsummaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorChuck Ebbert <76306.1226@compuserve.com>2006-01-16 09:47:37 +0100
committerJens Axboe <axboe@suse.de>2006-01-16 09:47:37 +0100
commit752a3b79630a290cbbe4731e7c61b75d4fbebc5c (patch)
tree21d1a7494890dce0903bf9e45ca6ec5059b6d739 /block
parentbarrier.txt got lost while the new barrier patchset was climbing up (diff)
downloadlinux-dev-752a3b79630a290cbbe4731e7c61b75d4fbebc5c.tar.xz
linux-dev-752a3b79630a290cbbe4731e7c61b75d4fbebc5c.zip
[BLOCK] elevator: Make elevator=as work again for anticipatory
Signed-off-by: Chuck Ebbert <76306.1226@compuserve.com> Signed-off-by: Jens Axboe <axboe@suse.de>
Diffstat (limited to 'block')
-rw-r--r--block/elevator.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/block/elevator.c b/block/elevator.c
index 1d0759178e4b..e8025b2ec54a 100644
--- a/block/elevator.c
+++ b/block/elevator.c
@@ -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.
*/