diff options
Diffstat (limited to 'include/linux/elevator.h')
| -rw-r--r-- | include/linux/elevator.h | 5 | 
1 files changed, 2 insertions, 3 deletions
| diff --git a/include/linux/elevator.h b/include/linux/elevator.h index a74c27e460ba..23fe746a1d51 100644 --- a/include/linux/elevator.h +++ b/include/linux/elevator.h | |||
| @@ -66,7 +66,7 @@ struct elevator_type | |||
| 66 | }; | 66 | }; | 
| 67 | 67 | ||
| 68 | /* | 68 | /* | 
| 69 | * each queue has an elevator_queue assoicated with it | 69 | * each queue has an elevator_queue associated with it | 
| 70 | */ | 70 | */ | 
| 71 | struct elevator_queue | 71 | struct elevator_queue | 
| 72 | { | 72 | { | 
| @@ -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 | 
| @@ -130,6 +128,7 @@ extern int elv_try_last_merge(request_queue_t *, struct bio *); | |||
| 130 | #define ELEVATOR_INSERT_FRONT 1 | 128 | #define ELEVATOR_INSERT_FRONT 1 | 
| 131 | #define ELEVATOR_INSERT_BACK 2 | 129 | #define ELEVATOR_INSERT_BACK 2 | 
| 132 | #define ELEVATOR_INSERT_SORT 3 | 130 | #define ELEVATOR_INSERT_SORT 3 | 
| 131 | #define ELEVATOR_INSERT_REQUEUE 4 | ||
| 133 | 132 | ||
| 134 | /* | 133 | /* | 
| 135 | * return values from elevator_may_queue_fn | 134 | * return values from elevator_may_queue_fn | 
