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 /drivers/block/pktcdvd.c | |
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 'drivers/block/pktcdvd.c')
-rw-r--r-- | drivers/block/pktcdvd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c index 42891d2b054e..888d1aceeeff 100644 --- a/drivers/block/pktcdvd.c +++ b/drivers/block/pktcdvd.c | |||
@@ -375,7 +375,7 @@ static int pkt_generic_packet(struct pktcdvd_device *pd, struct packet_command * | |||
375 | rq->cmd_len = COMMAND_SIZE(rq->cmd[0]); | 375 | rq->cmd_len = COMMAND_SIZE(rq->cmd[0]); |
376 | 376 | ||
377 | rq->ref_count++; | 377 | rq->ref_count++; |
378 | rq->waiting = &wait; | 378 | rq->end_io_data = &wait; |
379 | rq->end_io = blk_end_sync_rq; | 379 | rq->end_io = blk_end_sync_rq; |
380 | elv_add_request(q, rq, ELEVATOR_INSERT_BACK, 1); | 380 | elv_add_request(q, rq, ELEVATOR_INSERT_BACK, 1); |
381 | generic_unplug_device(q); | 381 | generic_unplug_device(q); |