make elv_try_merge() static, kill the dead declaration of
elv_try_last_merge(). Signed-off-by: Coywolf Qi Hunt <qiyong@fc-cn.com> Signed-off-by: Jens Axboe <axboe@suse.de>
This commit is contained in:
parent
1abee6d2d1
commit
769db45b73
2 changed files with 1 additions and 4 deletions
|
@ -64,7 +64,7 @@ inline int elv_rq_merge_ok(struct request *rq, struct bio *bio)
|
|||
}
|
||||
EXPORT_SYMBOL(elv_rq_merge_ok);
|
||||
|
||||
inline int elv_try_merge(struct request *__rq, struct bio *bio)
|
||||
static inline int elv_try_merge(struct request *__rq, struct bio *bio)
|
||||
{
|
||||
int ret = ELEVATOR_NO_MERGE;
|
||||
|
||||
|
@ -80,7 +80,6 @@ inline int elv_try_merge(struct request *__rq, struct bio *bio)
|
|||
|
||||
return ret;
|
||||
}
|
||||
EXPORT_SYMBOL(elv_try_merge);
|
||||
|
||||
static struct elevator_type *elevator_find(const char *name)
|
||||
{
|
||||
|
|
|
@ -114,8 +114,6 @@ extern ssize_t elv_iosched_store(request_queue_t *, const char *, size_t);
|
|||
extern int elevator_init(request_queue_t *, char *);
|
||||
extern void elevator_exit(elevator_t *);
|
||||
extern int elv_rq_merge_ok(struct request *, struct bio *);
|
||||
extern int elv_try_merge(struct request *, struct bio *);
|
||||
extern int elv_try_last_merge(request_queue_t *, struct bio *);
|
||||
|
||||
/*
|
||||
* Return values from elevator merger
|
||||
|
|
Loading…
Reference in a new issue