diff options
author | Tejun Heo <tj@kernel.org> | 2009-04-18 18:00:42 -0400 |
---|---|---|
committer | Jens Axboe <jens.axboe@oracle.com> | 2009-04-28 01:37:29 -0400 |
commit | ac0b0113ddbab3ed2388132d368c97292f9f3c84 (patch) | |
tree | 78a955c9169a03ec364e4021c0ca929c7424ff7a /drivers/ide/ide-atapi.c | |
parent | d868ca24302e99a0e8a86071ca2c66273edf97d9 (diff) |
ide-atapi: don't abuse rq->buffer
Impact: rq->buffer usage cleanup
ide-atapi uses rq->buffer as private opaque value for internal special
requests. rq->special isn't used for these cases (the only case where
rq->special is used is for ide-tape rw requests). Use rq->special
instead.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/ide/ide-atapi.c')
-rw-r--r-- | drivers/ide/ide-atapi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ide/ide-atapi.c b/drivers/ide/ide-atapi.c index 7201b176d75b..2894577237ba 100644 --- a/drivers/ide/ide-atapi.c +++ b/drivers/ide/ide-atapi.c | |||
@@ -90,7 +90,7 @@ static void ide_queue_pc_head(ide_drive_t *drive, struct gendisk *disk, | |||
90 | blk_rq_init(NULL, rq); | 90 | blk_rq_init(NULL, rq); |
91 | rq->cmd_type = REQ_TYPE_SPECIAL; | 91 | rq->cmd_type = REQ_TYPE_SPECIAL; |
92 | rq->cmd_flags |= REQ_PREEMPT; | 92 | rq->cmd_flags |= REQ_PREEMPT; |
93 | rq->buffer = (char *)pc; | 93 | rq->special = (char *)pc; |
94 | rq->rq_disk = disk; | 94 | rq->rq_disk = disk; |
95 | 95 | ||
96 | if (pc->req_xfer) { | 96 | if (pc->req_xfer) { |
@@ -119,7 +119,7 @@ int ide_queue_pc_tail(ide_drive_t *drive, struct gendisk *disk, | |||
119 | 119 | ||
120 | rq = blk_get_request(drive->queue, READ, __GFP_WAIT); | 120 | rq = blk_get_request(drive->queue, READ, __GFP_WAIT); |
121 | rq->cmd_type = REQ_TYPE_SPECIAL; | 121 | rq->cmd_type = REQ_TYPE_SPECIAL; |
122 | rq->buffer = (char *)pc; | 122 | rq->special = (char *)pc; |
123 | 123 | ||
124 | if (pc->req_xfer) { | 124 | if (pc->req_xfer) { |
125 | rq->data = pc->buf; | 125 | rq->data = pc->buf; |