diff options
| -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 39dcccc82ada..99a4d7b2f8ad 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) | |||
| 64 | } | 64 | } |
| 65 | EXPORT_SYMBOL(elv_rq_merge_ok); | 65 | EXPORT_SYMBOL(elv_rq_merge_ok); |
| 66 | 66 | ||
| 67 | inline int elv_try_merge(struct request *__rq, struct bio *bio) | 67 | static inline int elv_try_merge(struct request *__rq, struct bio *bio) |
| 68 | { | 68 | { |
| 69 | int ret = ELEVATOR_NO_MERGE; | 69 | int ret = ELEVATOR_NO_MERGE; |
| 70 | 70 | ||
| @@ -80,7 +80,6 @@ inline int elv_try_merge(struct request *__rq, struct bio *bio) | |||
| 80 | 80 | ||
| 81 | return ret; | 81 | return ret; |
| 82 | } | 82 | } |
| 83 | EXPORT_SYMBOL(elv_try_merge); | ||
| 84 | 83 | ||
| 85 | static struct elevator_type *elevator_find(const char *name) | 84 | static struct elevator_type *elevator_find(const char *name) |
| 86 | { | 85 | { |
diff --git a/include/linux/elevator.h b/include/linux/elevator.h index fb80fa44c4dd..4a6f50e31c73 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); | |||
| 114 | extern int elevator_init(request_queue_t *, char *); | 114 | extern int elevator_init(request_queue_t *, char *); |
| 115 | extern void elevator_exit(elevator_t *); | 115 | extern void elevator_exit(elevator_t *); |
| 116 | extern int elv_rq_merge_ok(struct request *, struct bio *); | 116 | extern int elv_rq_merge_ok(struct request *, struct bio *); |
| 117 | extern int elv_try_merge(struct request *, struct bio *); | ||
| 118 | extern int elv_try_last_merge(request_queue_t *, struct bio *); | ||
| 119 | 117 | ||
| 120 | /* | 118 | /* |
| 121 | * Return values from elevator merger | 119 | * Return values from elevator merger |
