aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2009-04-19 07:00:42 +0900
committerJens Axboe <jens.axboe@oracle.com>2009-04-28 07:37:29 +0200
commit1f181d2b1569dfb88a584a6e1847e9e1c7645951 (patch)
tree7a72aa199dddc8ea39cc424bb2c21f34e58089df
parentac0b0113ddbab3ed2388132d368c97292f9f3c84 (diff)
downloadkernel_samsung_espresso10-1f181d2b1569dfb88a584a6e1847e9e1c7645951.zip
kernel_samsung_espresso10-1f181d2b1569dfb88a584a6e1847e9e1c7645951.tar.gz
kernel_samsung_espresso10-1f181d2b1569dfb88a584a6e1847e9e1c7645951.tar.bz2
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>
-rw-r--r--drivers/ide/ide-cd.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
index b6a0d12..bb77c79 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,
rq->cmd_type = REQ_TYPE_SENSE;
rq->cmd_flags |= REQ_PREEMPT;
- /* NOTE! Save the failed command in "rq->buffer" */
- rq->buffer = (void *) failed_command;
+ /* NOTE! Save the failed command in "rq->special" */
+ rq->special = (void *)failed_command;
if (failed_command)
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,
static void ide_cd_complete_failed_rq(ide_drive_t *drive, struct request *rq)
{
/*
- * For REQ_TYPE_SENSE, "rq->buffer" points to the original
+ * For REQ_TYPE_SENSE, "rq->special" points to the original
* failed request
*/
- struct request *failed = (struct request *)rq->buffer;
+ struct request *failed = (struct request *)rq->special;
struct cdrom_info *info = drive->driver_data;
void *sense = &info->sense_data;