Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cbfd082a authored by Tejun Heo's avatar Tejun Heo
Browse files

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: default avatarTejun Heo <tj@kernel.org>
Cc: Jens Axboe <axboe@kernel.dk>
parent c267cc1c

drivers/ide/ide-cd.c

+4 −4
Original line number Diff line number Diff line
@@ -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;