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
[PATCH] Remove ->waiting member from struct request
[safe/jmp/linux-2.6]
/
include
/
linux
/
blkdev.h
diff --git
a/include/linux/blkdev.h
b/include/linux/blkdev.h
index
55ef6ef
..
604f231
100644
(file)
--- a/
include/linux/blkdev.h
+++ b/
include/linux/blkdev.h
@@
-232,7
+232,13
@@
struct request {
struct hlist_node hash; /* merge hash */
struct rb_node rb_node; /* sort/lookup */
struct hlist_node hash; /* merge hash */
struct rb_node rb_node; /* sort/lookup */
+ /*
+ * two pointers are available for the IO schedulers, if they need
+ * more they have to dynamically allocate it.
+ */
void *elevator_private;
void *elevator_private;
+ void *elevator_private2;
+
void *completion_data;
int rq_status; /* should split this into a few status bits */
void *completion_data;
int rq_status; /* should split this into a few status bits */
@@
-260,7
+266,6
@@
struct request {
request_queue_t *q;
struct request_list *rl;
request_queue_t *q;
struct request_list *rl;
- struct completion *waiting;
void *special;
char *buffer;
void *special;
char *buffer;
@@
-279,7
+284,7
@@
struct request {
int retries;
/*
int retries;
/*
- * completion callback.
end_io_data should be folded in with waiting
+ * completion callback.
*/
rq_end_io_fn *end_io;
void *end_io_data;
*/
rq_end_io_fn *end_io;
void *end_io_data;