diff options
| -rw-r--r-- | block/blk-core.c | 2 | ||||
| -rw-r--r-- | block/blk-mq-sched.c | 2 | ||||
| -rw-r--r-- | block/blk.h | 2 | ||||
| -rw-r--r-- | block/elevator.c | 10 |
4 files changed, 5 insertions, 11 deletions
diff --git a/block/blk-core.c b/block/blk-core.c index b00e7e6340ca..18b691c93b63 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -1179,7 +1179,7 @@ int blk_init_allocated_queue(struct request_queue *q) mutex_lock(&q->sysfs_lock); /* init elevator */ - if (elevator_init(q, NULL)) { + if (elevator_init(q)) { mutex_unlock(&q->sysfs_lock); goto out_exit_flush_rq; } diff --git a/block/blk-mq-sched.c b/block/blk-mq-sched.c index b0f2c2a40a0c..fd4f68d61df0 100644 --- a/block/blk-mq-sched.c +++ b/block/blk-mq-sched.c @@ -653,7 +653,7 @@ int blk_mq_sched_init(struct request_queue *q) int ret; mutex_lock(&q->sysfs_lock); - ret = elevator_init(q, NULL); + ret = elevator_init(q); mutex_unlock(&q->sysfs_lock); return ret; diff --git a/block/blk.h b/block/blk.h index a559c0532347..ab5ec2dadc7b 100644 --- a/block/blk.h +++ b/block/blk.h @@ -231,7 +231,7 @@ static inline void elv_deactivate_rq(struct request_queue *q, struct request *rq e->type->ops.sq.elevator_deactivate_req_fn(q, rq); } -int elevator_init(struct request_queue *, char *); +int elevator_init(struct request_queue *); void elevator_exit(struct request_queue *, struct elevator_queue *); int elv_register_queue(struct request_queue *q); void elv_unregister_queue(struct request_queue *q); 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", |