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 | 1f181d2b1569dfb88a584a6e1847e9e1c7645951 (patch) | |
tree | 7a72aa199dddc8ea39cc424bb2c21f34e58089df /drivers/ide/ide-cd.c | |
parent | ac0b0113ddbab3ed2388132d368c97292f9f3c84 (diff) |
ide-cd: don't abuse rq->buffer
Impact: rq->buffer usage cleanup
ide-cd uses rq->buffer to carry pointer to the original request when
issuing REQUEST_SENSE. Use rq->special instead.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/ide/ide-cd.c')
-rw-r--r-- | drivers/ide/ide-cd.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c index b6a0d126b576..bb77c79c1018 100644 --- a/drivers/ide/ide-cd.c +++ b/drivers/ide/ide-cd.c | |||
@@ -232,8 +232,8 @@ static void cdrom_queue_request_sense(ide_drive_t *drive, void *sense, | |||
232 | rq->cmd_type = REQ_TYPE_SENSE; | 232 | rq->cmd_type = REQ_TYPE_SENSE; |
233 | rq->cmd_flags |= REQ_PREEMPT; | 233 | rq->cmd_flags |= REQ_PREEMPT; |
234 | 234 | ||
235 | /* NOTE! Save the failed command in "rq->buffer" */ | 235 | /* NOTE! Save the failed command in "rq->special" */ |
236 | rq->buffer = (void *) failed_command; | 236 | rq->special = (void *)failed_command; |
237 | 237 | ||
238 | if (failed_command) | 238 | if (failed_command) |
239 | ide_debug_log(IDE_DBG_SENSE, "failed_cmd: 0x%x", | 239 | ide_debug_log(IDE_DBG_SENSE, "failed_cmd: 0x%x", |
@@ -247,10 +247,10 @@ static void cdrom_queue_request_sense(ide_drive_t *drive, void *sense, | |||
247 | static void ide_cd_complete_failed_rq(ide_drive_t *drive, struct request *rq) | 247 | static void ide_cd_complete_failed_rq(ide_drive_t *drive, struct request *rq) |
248 | { | 248 | { |
249 | /* | 249 | /* |
250 | * For REQ_TYPE_SENSE, "rq->buffer" points to the original | 250 | * For REQ_TYPE_SENSE, "rq->special" points to the original |
251 | * failed request | 251 | * failed request |
252 | */ | 252 | */ |
253 | struct request *failed = (struct request *)rq->buffer; | 253 | struct request *failed = (struct request *)rq->special; |
254 | struct cdrom_info *info = drive->driver_data; | 254 | struct cdrom_info *info = drive->driver_data; |
255 | void *sense = &info->sense_data; | 255 | void *sense = &info->sense_data; |
256 | 256 | ||