diff options
author | Jens Axboe <axboe@kernel.dk> | 2006-09-30 14:29:12 -0400 |
---|---|---|
committer | Jens Axboe <axboe@kernel.dk> | 2006-09-30 14:29:12 -0400 |
commit | c00895ab2f08df7044e58ee01c38bf0a661ea0eb (patch) | |
tree | 95dee4eb76042087c4b8d43a5841b6bae85b8cf3 /include/linux/blkdev.h | |
parent | 8a8e674cb1dafc818ffea93d97e4c1c1f01fdbb6 (diff) |
[PATCH] Remove ->waiting member from struct request
As the comments indicates in blkdev.h, we can fold it into ->end_io_data
usage as that is really what ->waiting is. Fixup the users of
blk_end_sync_rq().
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'include/linux/blkdev.h')
-rw-r--r-- | include/linux/blkdev.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index d2dc17151f6c..604f23189097 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h | |||
@@ -266,7 +266,6 @@ struct request { | |||
266 | request_queue_t *q; | 266 | request_queue_t *q; |
267 | struct request_list *rl; | 267 | struct request_list *rl; |
268 | 268 | ||
269 | struct completion *waiting; | ||
270 | void *special; | 269 | void *special; |
271 | char *buffer; | 270 | char *buffer; |
272 | 271 | ||
@@ -285,7 +284,7 @@ struct request { | |||
285 | int retries; | 284 | int retries; |
286 | 285 | ||
287 | /* | 286 | /* |
288 | * completion callback. end_io_data should be folded in with waiting | 287 | * completion callback. |
289 | */ | 288 | */ |
290 | rq_end_io_fn *end_io; | 289 | rq_end_io_fn *end_io; |
291 | void *end_io_data; | 290 | void *end_io_data; |