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>

diff --git a/block/elevator.c b/block/elevator.c
index bf11e70f008b10692cdc290e14fc351f30f972c9..80f4854510961ad1b7c46bf1b9f816207bb08ea6 100644 (file)
--- 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 3a216318ae739a05daa9e65a9f4c872bebc01c14..d44840368ee7dcf0d5e01bd96a9180f7d592a1d3 100644 (file)
--- 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 *);