diff options
| author | Coywolf Qi Hunt <qiyong@fc-cn.com> | 2005-12-28 10:55:49 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@nelson.home.kernel.dk> | 2006-01-09 14:44:15 +0100 |
| commit | 769db45b73896a88d6b40e3e648dfc50a155ec93 (patch) | |
| tree | 773ffec86ddf1ab3ddaf1de5959ec3b94807e395 | |
| parent | 1abee6d2d1b6366df96fce1d43eefd1819e1b055 (diff) | |
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>
| -rw-r--r-- | block/elevator.c | 3 | ||||
| -rw-r--r-- | include/linux/elevator.h | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/block/elevator.c b/block/elevator.c index 39dcccc82ad..99a4d7b2f8a 100644 --- a/block/elevator.c +++ b/block/elevator.c @@ -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) { diff --git a/include/linux/elevator.h b/include/linux/elevator.h index fb80fa44c4d..4a6f50e31c7 100644 --- a/include/linux/elevator.h +++ b/include/linux/elevator.h @@ -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 |