diff options
| author | Christoph Hellwig <hch@lst.de> | 2018-05-31 19:11:37 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2018-06-01 07:38:16 -0600 |
| commit | a8a275c9c2fb6bc9b45ad3e4187469726e2af7d1 (patch) | |
| tree | b771585df1efde4ea463527203d1cc7f967e4193 | |
| parent | cbf62af3537a5a735594983a87112a8cd08480a3 (diff) | |
| download | linux-security-a8a275c9c2fb6bc9b45ad3e4187469726e2af7d1.tar.gz | |
block: unexport elevator_init/exit
These are only used by the block core. Also move the declarations to
block/blk.h.
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>
| -rw-r--r-- | block/blk.h | 2 | ||||
| -rw-r--r-- | block/elevator.c | 2 | ||||
| -rw-r--r-- | include/linux/elevator.h | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/block/blk.h b/block/blk.h index eaf1a8e87d117c..a559c05323478b 100644 --- a/block/blk.h +++ b/block/blk.h @@ -231,6 +231,8 @@ 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 *); +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 8b64f92e029a5c..a7baa4687b28d8 100644 --- a/block/elevator.c +++ b/block/elevator.c @@ -263,7 +263,6 @@ int elevator_init(struct request_queue *q, char *name) elevator_put(e); return err; } -EXPORT_SYMBOL(elevator_init); void elevator_exit(struct request_queue *q, struct elevator_queue *e) { @@ -276,7 +275,6 @@ void elevator_exit(struct request_queue *q, struct elevator_queue *e) kobject_put(&e->kobj); } -EXPORT_SYMBOL(elevator_exit); static inline void __elv_rqhash_del(struct request *rq) { diff --git a/include/linux/elevator.h b/include/linux/elevator.h index 6d9e230dffd29f..a02deea3018571 100644 --- a/include/linux/elevator.h +++ b/include/linux/elevator.h @@ -218,8 +218,6 @@ extern void elv_unregister(struct elevator_type *); extern ssize_t elv_iosched_show(struct request_queue *, char *); 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 bool elv_bio_merge_ok(struct request *, struct bio *); extern struct elevator_queue *elevator_alloc(struct request_queue *, struct elevator_type *); |