diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2009-10-03 09:37:51 +0200 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2009-10-03 09:37:51 +0200 |
| commit | 492af6350a5ccf087e4964104a276ed358811458 (patch) | |
| tree | 81d6398597758f5b712e1f47a3f24f0da66127ba /block/elevator.c | |
| parent | drbd: remove tracing bits (diff) | |
| download | linux-492af6350a5ccf087e4964104a276ed358811458.tar.xz linux-492af6350a5ccf087e4964104a276ed358811458.zip | |
block: remove the anticipatory IO scheduler
AS is mostly a subset of CFQ, so there's little point in still
providing this separate IO scheduler. Hopefully at some point we
can get down to one single IO scheduler again, at least this brings
us closer by having only one intelligent IO scheduler.
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'block/elevator.c')
| -rw-r--r-- | block/elevator.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/block/elevator.c b/block/elevator.c index 1975b619c86d..bb30f0e92d4d 100644 --- a/block/elevator.c +++ b/block/elevator.c @@ -154,10 +154,7 @@ static struct elevator_type *elevator_get(const char *name) 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); @@ -193,10 +190,7 @@ static int __init elevator_setup(char *str) * 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; } |