redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

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>
hifive-unleashed-5.1
Christoph Hellwig 2018-05-31 19:11:38 +02:00 committed by Jens Axboe
parent a8a275c9c2
commit ddb7253254
4 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
block/blk-core.c
View File

@ -1179,7 +1179,7 @@ int blk_init_allocated_queue(struct request_queue *q)
mutex_lock(&q->sysfs_lock); mutex_lock(&q->sysfs_lock);
/* init elevator */ /* init elevator */
if (elevator_init(q, NULL)) { if (elevator_init(q)) {
mutex_unlock(&q->sysfs_lock); mutex_unlock(&q->sysfs_lock);
goto out_exit_flush_rq; goto out_exit_flush_rq;
} }

2
block/blk-mq-sched.c
View File

@ -653,7 +653,7 @@ int blk_mq_sched_init(struct request_queue *q)
int ret; int ret;
mutex_lock(&q->sysfs_lock); mutex_lock(&q->sysfs_lock);
ret = elevator_init(q, NULL); ret = elevator_init(q);
mutex_unlock(&q->sysfs_lock); mutex_unlock(&q->sysfs_lock);
return ret; return ret;

2
block/blk.h
View File

@ -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); 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 *); void elevator_exit(struct request_queue *, struct elevator_queue *);
int elv_register_queue(struct request_queue *q); int elv_register_queue(struct request_queue *q);
void elv_unregister_queue(struct request_queue *q); void elv_unregister_queue(struct request_queue *q);

10
block/elevator.c
View File

@ -199,7 +199,7 @@ static void elevator_release(struct kobject *kobj)
kfree(e); kfree(e);
} }
int elevator_init(struct request_queue *q, char *name) int elevator_init(struct request_queue *q)
{ {
struct elevator_type *e = NULL; struct elevator_type *e = NULL;
int err; int err;
@ -213,19 +213,13 @@ int elevator_init(struct request_queue *q, char *name)
if (unlikely(q->elevator)) if (unlikely(q->elevator))
return 0; return 0;
if (name) {
e = elevator_get(q, name, true);
if (!e)
return -EINVAL;
}
/* /*
* Use the default elevator specified by config boot param for * Use the default elevator specified by config boot param for
* non-mq devices, or by config option. Don't try to load modules * 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 * as we could be running off async and request_module() isn't
* allowed from async. * allowed from async.
*/ */
if (!e && !q->mq_ops && *chosen_elevator) { if (!q->mq_ops && *chosen_elevator) {
e = elevator_get(q, chosen_elevator, false); e = elevator_get(q, chosen_elevator, false);
if (!e) if (!e)
printk(KERN_ERR "I/O scheduler %s not found\n", printk(KERN_ERR "I/O scheduler %s not found\n",