diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2009-10-13 14:29:45 +0400 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2009-10-13 14:29:45 +0400 |
| commit | c30f33437c3f85ec48353a1ef811e148217a2aaf (patch) | |
| tree | d5a0ca1e8d091a30fece2e9aeed285225c026049 /block/elevator.c | |
| parent | 132cc538cd90f60a0b5df6a512dfd4bc5fe2039a (diff) | |
| parent | 2ec24ff1d1875defa742c76c9c7d74dca06b7e1f (diff) | |
| download | linux-c30f33437c3f85ec48353a1ef811e148217a2aaf.tar.xz | |
Merge branch 'for-linus' into for-2.6.33
Diffstat (limited to 'block/elevator.c')
| -rw-r--r-- | block/elevator.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/block/elevator.c b/block/elevator.c index bb30f0e92d4d..9ad5ccc4c5ee 100644 --- a/block/elevator.c +++ b/block/elevator.c @@ -1053,9 +1053,7 @@ ssize_t elv_iosched_store(struct request_queue *q, const char *name, 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; |