summaryrefslogtreecommitdiffstats
path: root/block/elevator.c
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2018-05-31 19:11:38 +0200
committerJens Axboe <axboe@kernel.dk>2018-06-01 07:38:17 -0600
commitddb7253254fee6922764043101f8b28b6a00595d (patch)
tree07463c68dc65a1dbc0de3398d9145320f31ec41a /block/elevator.c
parenta8a275c9c2fb6bc9b45ad3e4187469726e2af7d1 (diff)
downloadlinux-ddb7253254fee6922764043101f8b28b6a00595d.tar.bz2
block: remove the always unused name argument to elevator_init
Reported-by: Damien Le Moal <Damien.LeMoal@wdc.com> Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Damien Le Moal <damien.lemoal@wdc.com> Tested-by: Damien Le Moal <damien.lemoal@wdc.com> Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/elevator.c')
-rw-r--r--block/elevator.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/block/elevator.c b/block/elevator.c
index a7baa4687b28..9276540af2a1 100644
--- a/block/elevator.c
+++ b/block/elevator.c
@@ -199,7 +199,7 @@ static void elevator_release(struct kobject *kobj)
kfree(e);
}
-int elevator_init(struct request_queue *q, char *name)
+int elevator_init(struct request_queue *q)
{
struct elevator_type *e = NULL;
int err;
@@ -213,19 +213,13 @@ int elevator_init(struct request_queue *q, char *name)
if (unlikely(q->elevator))
return 0;
- if (name) {
- e = elevator_get(q, name, true);
- if (!e)
- return -EINVAL;
- }
-
/*
* Use the default elevator specified by config boot param for
* non-mq devices, or by config option. Don't try to load modules
* as we could be running off async and request_module() isn't
* allowed from async.
*/
- if (!e && !q->mq_ops && *chosen_elevator) {
+ if (!q->mq_ops && *chosen_elevator) {
e = elevator_get(q, chosen_elevator, false);
if (!e)
printk(KERN_ERR "I/O scheduler %s not found\n",