Merge branch 'upstream'

[linux-2.6] / block / elevator.c

diff --git a/block/elevator.c b/block/elevator.c
index 1d0759178e4b49710c6cb90c538fc6d0c897e126..c9f424d5399c55b588779f252e8bb41b0fe51410 100644 (file)
--- a/block/elevator.c
+++ b/block/elevator.c
@@ -149,13 +149,20 @@ 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.
+        * If the given scheduler is not available, fall back to the default
         */
        if ((e = elevator_find(chosen_elevator)))
                elevator_put(e);
        else
-               strcpy(chosen_elevator, "noop");
+               strcpy(chosen_elevator, CONFIG_DEFAULT_IOSCHED);
 }
 
 static int __init elevator_setup(char *str)