summaryrefslogtreecommitdiffstats
path: root/block/elevator.c
diff options
context:
space:
mode:
authorJens Axboe <jens.axboe@oracle.com>2009-10-13 12:29:45 +0200
committerJens Axboe <jens.axboe@oracle.com>2009-10-13 12:29:45 +0200
commitc30f33437c3f85ec48353a1ef811e148217a2aaf (patch)
treed5a0ca1e8d091a30fece2e9aeed285225c026049 /block/elevator.c
parent132cc538cd90f60a0b5df6a512dfd4bc5fe2039a (diff)
parent2ec24ff1d1875defa742c76c9c7d74dca06b7e1f (diff)
downloadlinux-c30f33437c3f85ec48353a1ef811e148217a2aaf.tar.bz2
Merge branch 'for-linus' into for-2.6.33
Diffstat (limited to 'block/elevator.c')
-rw-r--r--block/elevator.c4
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;