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

Commit 22ce0a7c authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

ide: don't use req->special 



Just replace it with a field of the same name in struct ide_req.

Reviewed-by: default avatarHannes Reinecke <hare@suse.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 289d088b

drivers/ide/ide-atapi.c

+2 −2
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ int ide_queue_pc_tail(ide_drive_t *drive, struct gendisk *disk, 


	rq = blk_get_request(drive->queue, REQ_OP_DRV_IN, 0);

	ide_req(rq)->type = ATA_PRIV_MISC;

	rq->special = (char *)pc;

	ide_req(rq)->special = pc;



	if (buf && bufflen) {

		error = blk_rq_map_kern(drive->queue, rq, buf, bufflen,
@@ -244,7 +244,7 @@ int ide_queue_sense_rq(ide_drive_t *drive, void *special) 
		return -ENOMEM;

	}



	sense_rq->special = special;

	ide_req(sense_rq)->special = special;

	drive->sense_rq_armed = false;



	drive->hwif->rq = NULL;

drivers/ide/ide-cd.c

+2 −2
Original line number Diff line number Diff line
@@ -211,12 +211,12 @@ static void cdrom_analyze_sense_data(ide_drive_t *drive, 
static void ide_cd_complete_failed_rq(ide_drive_t *drive, struct request *rq)

{

	/*

	 * For ATA_PRIV_SENSE, "rq->special" points to the original

	 * For ATA_PRIV_SENSE, "ide_req(rq)->special" points to the original

	 * failed request.  Also, the sense data should be read

	 * directly from rq which might be different from the original

	 * sense buffer if it got copied during mapping.

	 */

	struct request *failed = (struct request *)rq->special;

	struct request *failed = ide_req(rq)->special;

	void *sense = bio_data(rq->bio);



	if (failed) {

drivers/ide/ide-devsets.c

+2 −2
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ int ide_devset_execute(ide_drive_t *drive, const struct ide_devset *setting, 
	scsi_req(rq)->cmd_len = 5;

	scsi_req(rq)->cmd[0] = REQ_DEVSET_EXEC;

	*(int *)&scsi_req(rq)->cmd[1] = arg;

	rq->special = setting->set;

	ide_req(rq)->special = setting->set;



	blk_execute_rq(q, NULL, rq, 0);

	ret = scsi_req(rq)->result;
@@ -182,7 +182,7 @@ int ide_devset_execute(ide_drive_t *drive, const struct ide_devset *setting, 


ide_startstop_t ide_do_devset(ide_drive_t *drive, struct request *rq)

{

	int err, (*setfunc)(ide_drive_t *, int) = rq->special;

	int err, (*setfunc)(ide_drive_t *, int) = ide_req(rq)->special;



	err = setfunc(drive, *(int *)&scsi_req(rq)->cmd[1]);

	if (err)

drivers/ide/ide-disk.c

+3 −3
Original line number Diff line number Diff line
@@ -434,8 +434,8 @@ static bool idedisk_prep_rq(ide_drive_t *drive, struct request *rq) 
	if (req_op(rq) != REQ_OP_FLUSH)

		return true;



	if (rq->special) {

		cmd = rq->special;

	if (ide_req(rq)->special) {

		cmd = ide_req(rq)->special;

		memset(cmd, 0, sizeof(*cmd));

	} else {

		cmd = kzalloc(sizeof(*cmd), GFP_ATOMIC);
@@ -455,7 +455,7 @@ static bool idedisk_prep_rq(ide_drive_t *drive, struct request *rq) 
	rq->cmd_flags &= ~REQ_OP_MASK;

	rq->cmd_flags |= REQ_OP_DRV_OUT;

	ide_req(rq)->type = ATA_PRIV_TASKFILE;

	rq->special = cmd;

	ide_req(rq)->special = cmd;

	cmd->rq = rq;



	return true;

drivers/ide/ide-eh.c

+1 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ ide_startstop_t ide_error(ide_drive_t *drive, const char *msg, u8 stat) 
	/* retry only "normal" I/O: */

	if (blk_rq_is_passthrough(rq)) {

		if (ata_taskfile_request(rq)) {

			struct ide_cmd *cmd = rq->special;

			struct ide_cmd *cmd = ide_req(rq)->special;



			if (cmd)

				ide_complete_cmd(drive, cmd, stat, err);