Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a8a275c9 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

block: unexport elevator_init/exit 



These are only used by the block core.  Also move the declarations to
block/blk.h.

Reported-by: default avatarDamien Le Moal <Damien.LeMoal@wdc.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDamien Le Moal <damien.lemoal@wdc.com>
Tested-by: default avatarDamien Le Moal <damien.lemoal@wdc.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent cbf62af3

block/blk.h

+2 −0
Original line number Diff line number Diff line
@@ -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);

block/elevator.c

+0 −2
Original line number Diff line number Diff line
@@ -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)

{

include/linux/elevator.h

+0 −2
Original line number Diff line number Diff line
@@ -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 *);