diff options
| author | Bart Van Assche <bart.vanassche@sandisk.com> | 2017-05-01 17:58:49 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2017-05-02 15:52:08 +0200 |
| commit | c0332694903a37cf8ecdc9102d5c9e09cf8643d0 (patch) | |
| tree | 3adf45276fdb1217e035696ef456426594ad00d0 | |
| parent | Merge branch 'for-4.12/post-merge' of git://git.kernel.dk/linux-block (diff) | |
| download | linux-c0332694903a37cf8ecdc9102d5c9e09cf8643d0.tar.xz linux-c0332694903a37cf8ecdc9102d5c9e09cf8643d0.zip | |
block: Remove elevator_change()
Since commit 84253394927c ("remove the mg_disk driver") removed the
only caller of elevator_change(), also remove the elevator_change()
function itself.
Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Markus Trippelsdorf <markus@trippelsdorf.de>
Signed-off-by: Jens Axboe <axboe@fb.com>
| -rw-r--r-- | block/elevator.c | 13 | ||||
| -rw-r--r-- | include/linux/elevator.h | 1 |
2 files changed, 0 insertions, 14 deletions
diff --git a/block/elevator.c b/block/elevator.c index bf11e70f008b..80f485451096 100644 --- a/block/elevator.c +++ b/block/elevator.c @@ -1088,19 +1088,6 @@ static int __elevator_change(struct request_queue *q, const char *name) return elevator_switch(q, e); } -int elevator_change(struct request_queue *q, const char *name) -{ - int ret; - - /* Protect q->elevator from elevator_init() */ - mutex_lock(&q->sysfs_lock); - ret = __elevator_change(q, name); - mutex_unlock(&q->sysfs_lock); - - return ret; -} -EXPORT_SYMBOL(elevator_change); - static inline bool elv_support_iosched(struct request_queue *q) { if (q->mq_ops && q->tag_set && (q->tag_set->flags & diff --git a/include/linux/elevator.h b/include/linux/elevator.h index 3a216318ae73..d44840368ee7 100644 --- a/include/linux/elevator.h +++ b/include/linux/elevator.h @@ -214,7 +214,6 @@ extern ssize_t elv_iosched_store(struct request_queue *, const char *, size_t); extern int elevator_init(struct request_queue *, char *); extern void elevator_exit(struct request_queue *, struct elevator_queue *); -extern int elevator_change(struct request_queue *, const char *); extern bool elv_bio_merge_ok(struct request *, struct bio *); extern struct elevator_queue *elevator_alloc(struct request_queue *, struct elevator_type *); |