aboutsummaryrefslogtreecommitdiffstats
path: root/block/cfq-iosched.c
diff options
context:
space:
mode:
authorJens Axboe <jens.axboe@oracle.com>2008-10-31 05:05:07 -0400
committerJens Axboe <jens.axboe@oracle.com>2008-12-29 02:29:50 -0500
commitb374d18a4bfce705e4a99ae9f501b53e86ecb283 (patch)
tree7e773464725a78e96a2017fa36cf9d4a4e29f73b /block/cfq-iosched.c
parentabf137dd7712132ee56d5b3143c2ff61a72a5faa (diff)
block: get rid of elevator_t typedef
Just use struct elevator_queue everywhere instead. Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'block/cfq-iosched.c')
-rw-r--r--block/cfq-iosched.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
index a2bfec7d6b36..adaf93a9d19d 100644
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
@@ -2178,7 +2178,7 @@ static void cfq_put_async_queues(struct cfq_data *cfqd)
2178 cfq_put_queue(cfqd->async_idle_cfqq); 2178 cfq_put_queue(cfqd->async_idle_cfqq);
2179} 2179}
2180 2180
2181static void cfq_exit_queue(elevator_t *e) 2181static void cfq_exit_queue(struct elevator_queue *e)
2182{ 2182{
2183 struct cfq_data *cfqd = e->elevator_data; 2183 struct cfq_data *cfqd = e->elevator_data;
2184 struct request_queue *q = cfqd->queue; 2184 struct request_queue *q = cfqd->queue;
@@ -2288,7 +2288,7 @@ cfq_var_store(unsigned int *var, const char *page, size_t count)
2288} 2288}
2289 2289
2290#define SHOW_FUNCTION(__FUNC, __VAR, __CONV) \ 2290#define SHOW_FUNCTION(__FUNC, __VAR, __CONV) \
2291static ssize_t __FUNC(elevator_t *e, char *page) \ 2291static ssize_t __FUNC(struct elevator_queue *e, char *page) \
2292{ \ 2292{ \
2293 struct cfq_data *cfqd = e->elevator_data; \ 2293 struct cfq_data *cfqd = e->elevator_data; \
2294 unsigned int __data = __VAR; \ 2294 unsigned int __data = __VAR; \
@@ -2308,7 +2308,7 @@ SHOW_FUNCTION(cfq_slice_async_rq_show, cfqd->cfq_slice_async_rq, 0);
2308#undef SHOW_FUNCTION 2308#undef SHOW_FUNCTION
2309 2309
2310#define STORE_FUNCTION(__FUNC, __PTR, MIN, MAX, __CONV) \ 2310#define STORE_FUNCTION(__FUNC, __PTR, MIN, MAX, __CONV) \
2311static ssize_t __FUNC(elevator_t *e, const char *page, size_t count) \ 2311static ssize_t __FUNC(struct elevator_queue *e, const char *page, size_t count) \
2312{ \ 2312{ \
2313 struct cfq_data *cfqd = e->elevator_data; \ 2313 struct cfq_data *cfqd = e->elevator_data; \
2314 unsigned int __data; \ 2314 unsigned int __data; \