summaryrefslogtreecommitdiffstats
path: root/drivers/block/paride/pd.c
diff options
context:
space:
mode:
authorJens Axboe <axboe@kernel.dk>2006-09-30 20:29:12 +0200
committerJens Axboe <axboe@kernel.dk>2006-09-30 20:29:12 +0200
commitc00895ab2f08df7044e58ee01c38bf0a661ea0eb (patch)
tree95dee4eb76042087c4b8d43a5841b6bae85b8cf3 /drivers/block/paride/pd.c
parent8a8e674cb1dafc818ffea93d97e4c1c1f01fdbb6 (diff)
downloadlinux-c00895ab2f08df7044e58ee01c38bf0a661ea0eb.tar.bz2
[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 'drivers/block/paride/pd.c')
-rw-r--r--drivers/block/paride/pd.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/block/paride/pd.c b/drivers/block/paride/pd.c
index 12ff1a274d91..500d2ebb41e4 100644
--- a/drivers/block/paride/pd.c
+++ b/drivers/block/paride/pd.c
@@ -722,11 +722,10 @@ static int pd_special_command(struct pd_unit *disk,
rq.rq_status = RQ_ACTIVE;
rq.rq_disk = disk->gd;
rq.ref_count = 1;
- rq.waiting = &wait;
+ rq.end_io_data = &wait;
rq.end_io = blk_end_sync_rq;
blk_insert_request(disk->gd->queue, &rq, 0, func);
wait_for_completion(&wait);
- rq.waiting = NULL;
if (rq.errors)
err = -EIO;
blk_put_request(&rq);