git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
block: get rid of elevator_t typedef
[safe/jmp/linux-2.6]
/
block
/
cfq-iosched.c
diff --git
a/block/cfq-iosched.c
b/block/cfq-iosched.c
index
a2bfec7
..
adaf93a
100644
(file)
--- a/
block/cfq-iosched.c
+++ b/
block/cfq-iosched.c
@@
-2178,7
+2178,7
@@
static void cfq_put_async_queues(struct cfq_data *cfqd)
cfq_put_queue(cfqd->async_idle_cfqq);
}
cfq_put_queue(cfqd->async_idle_cfqq);
}
-static void cfq_exit_queue(
elevator_t
*e)
+static void cfq_exit_queue(
struct elevator_queue
*e)
{
struct cfq_data *cfqd = e->elevator_data;
struct request_queue *q = cfqd->queue;
{
struct cfq_data *cfqd = e->elevator_data;
struct request_queue *q = cfqd->queue;
@@
-2288,7
+2288,7
@@
cfq_var_store(unsigned int *var, const char *page, size_t count)
}
#define SHOW_FUNCTION(__FUNC, __VAR, __CONV) \
}
#define SHOW_FUNCTION(__FUNC, __VAR, __CONV) \
-static ssize_t __FUNC(
elevator_t *e, char *page)
\
+static ssize_t __FUNC(
struct elevator_queue *e, char *page)
\
{ \
struct cfq_data *cfqd = e->elevator_data; \
unsigned int __data = __VAR; \
{ \
struct cfq_data *cfqd = e->elevator_data; \
unsigned int __data = __VAR; \
@@
-2308,7
+2308,7
@@
SHOW_FUNCTION(cfq_slice_async_rq_show, cfqd->cfq_slice_async_rq, 0);
#undef SHOW_FUNCTION
#define STORE_FUNCTION(__FUNC, __PTR, MIN, MAX, __CONV) \
#undef SHOW_FUNCTION
#define STORE_FUNCTION(__FUNC, __PTR, MIN, MAX, __CONV) \
-static ssize_t __FUNC(
elevator_t *e, const char *page, size_t count)
\
+static ssize_t __FUNC(
struct elevator_queue *e, const char *page, size_t count)
\
{ \
struct cfq_data *cfqd = e->elevator_data; \
unsigned int __data; \
{ \
struct cfq_data *cfqd = e->elevator_data; \
unsigned int __data; \