From 762e77b4c90a082fb812c8bf70d22521f81be408 Mon Sep 17 00:00:00 2001 From: Coywolf Qi Hunt Date: Wed, 28 Dec 2005 10:55:49 +0100 Subject: [PATCH] --- yaml --- r: 17079 b: refs/heads/master c: 769db45b73896a88d6b40e3e648dfc50a155ec93 h: refs/heads/master i: 17077: 65c4694e8664a7eecd8f03450f78284d494eb6b0 17075: e09325725b9e802804b31f3d24c978b866a59175 17071: 68593e2b106853854a8f221696760deb69595a4c v: v3 --- [refs] | 2 +- trunk/block/elevator.c | 3 +-- trunk/include/linux/elevator.h | 2 -- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 20458071f3ed..dc9be66e56b6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1abee6d2d1b6366df96fce1d43eefd1819e1b055 +refs/heads/master: 769db45b73896a88d6b40e3e648dfc50a155ec93 diff --git a/trunk/block/elevator.c b/trunk/block/elevator.c index 39dcccc82ada..99a4d7b2f8ad 100644 --- a/trunk/block/elevator.c +++ b/trunk/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/trunk/include/linux/elevator.h b/trunk/include/linux/elevator.h index fb80fa44c4dd..4a6f50e31c73 100644 --- a/trunk/include/linux/elevator.h +++ b/trunk/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