Merge branch 'for-linus' into for-2.6.33
Jens Axboe [Tue, 13 Oct 2009 10:29:45 +0000 (12:29 +0200)]
1  2 
block/elevator.c

diff --combined block/elevator.c
@@@ -154,7 -154,10 +154,7 @@@ static struct elevator_type *elevator_g
  
                spin_unlock(&elv_list_lock);
  
 -              if (!strcmp(name, "anticipatory"))
 -                      sprintf(elv, "as-iosched");
 -              else
 -                      sprintf(elv, "%s-iosched", name);
 +              sprintf(elv, "%s-iosched", name);
  
                request_module("%s", elv);
                spin_lock(&elv_list_lock);
@@@ -190,7 -193,10 +190,7 @@@ static int __init elevator_setup(char *
         * Be backwards-compatible with previous kernels, so users
         * won't get the wrong elevator.
         */
 -      if (!strcmp(str, "as"))
 -              strcpy(chosen_elevator, "anticipatory");
 -      else
 -              strncpy(chosen_elevator, str, sizeof(chosen_elevator) - 1);
 +      strncpy(chosen_elevator, str, sizeof(chosen_elevator) - 1);
        return 1;
  }
  
@@@ -1053,9 -1059,7 +1053,7 @@@ ssize_t elv_iosched_store(struct reques
                return count;
  
        strlcpy(elevator_name, name, sizeof(elevator_name));
-       strstrip(elevator_name);
-       e = elevator_get(elevator_name);
+       e = elevator_get(strstrip(elevator_name));
        if (!e) {
                printk(KERN_ERR "elevator: type %s not found\n", elevator_name);
                return -EINVAL;