From: Coywolf Qi Hunt Date: Wed, 28 Dec 2005 09:55:49 +0000 (+0100) Subject: make elv_try_merge() static, kill the dead declaration of X-Git-Tag: v2.6.16-rc1~676 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=769db45b73896a88d6b40e3e648dfc50a155ec93;p=linux-2.6-omap-h63xx.git make elv_try_merge() static, kill the dead declaration of elv_try_last_merge(). Signed-off-by: Coywolf Qi Hunt Signed-off-by: Jens Axboe --- 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