summaryrefslogtreecommitdiffstats
path: root/block/elevator.c
diff options
context:
space:
mode:
authorJens Axboe <axboe@fb.com>2017-05-10 07:40:04 -0600
committerJens Axboe <axboe@fb.com>2017-05-10 07:40:04 -0600
commit340ff3216799a947fe0b07bed8f0409ffc716be9 (patch)
treea9404a8b344d77c1425e4a4230c1dbebf3c96ba5 /block/elevator.c
parent43c1b3d6e536b7b21ed329ae54280d8ba308ba92 (diff)
downloadlinux-stable-340ff3216799a947fe0b07bed8f0409ffc716be9.tar.gz
linux-stable-340ff3216799a947fe0b07bed8f0409ffc716be9.tar.bz2
linux-stable-340ff3216799a947fe0b07bed8f0409ffc716be9.zip
elevator: remove redundant warnings on IO scheduler switch
We warn twice for switching to a scheduler, if that switch fails. As we also report the failure in the return value to the sysfs write, remove the dmesg induced failures. Keep the failure print for warning to switch to the kconfig selected IO scheduler, as we can't report errors for that in any other way. Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'block/elevator.c')
-rw-r--r--block/elevator.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/block/elevator.c b/block/elevator.c
index ab726a5c0bf6..dac99fbfc273 100644
--- a/block/elevator.c
+++ b/block/elevator.c
@@ -1062,10 +1062,8 @@ static int __elevator_change(struct request_queue *q, const char *name)
strlcpy(elevator_name, name, sizeof(elevator_name));
e = elevator_get(strstrip(elevator_name), true);
- if (!e) {
- printk(KERN_ERR "elevator: type %s not found\n", elevator_name);
+ if (!e)
return -EINVAL;
- }
if (q->elevator &&
!strcmp(elevator_name, q->elevator->type->elevator_name)) {
@@ -1105,7 +1103,6 @@ ssize_t elv_iosched_store(struct request_queue *q, const char *name,
if (!ret)
return count;
- printk(KERN_ERR "elevator: switch to %s failed\n", name);
return ret;
}