ide-cd: don't abuse rq->buffer
authorTejun Heo <tj@kernel.org>
Sat, 18 Apr 2009 22:00:42 +0000 (07:00 +0900)
committerJens Axboe <jens.axboe@oracle.com>
Tue, 28 Apr 2009 05:37:29 +0000 (07:37 +0200)
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>
drivers/ide/ide-cd.c

index b6a0d126b57638024229e0381142d303314659e4..bb77c79c1018d99c3b9aebd2d196ab33bbd8bd5a 100644 (file)
@@ -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;