Commit c14f1fee authored by Bart Van Assche's avatar Bart Van Assche Committed by Martin K. Petersen
Browse files

scsi: csiostor: Use scsi_cmd_to_rq() instead of scsi_cmnd.request 

Prepare for removal of the request pointer by using scsi_cmd_to_rq()
instead. This patch does not change any functionality.

Link: https://lore.kernel.org/r/20210809230355.8186-18-bvanassche@acm.org


Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 4bfb9809

drivers/scsi/csiostor/csio_scsi.c

+3 −3
Original line number Diff line number Diff line
@@ -1786,7 +1786,7 @@ csio_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmnd) 
	struct csio_scsi_qset *sqset;

	struct fc_rport *rport = starget_to_rport(scsi_target(cmnd->device));



	sqset = &hw->sqset[ln->portid][blk_mq_rq_cpu(cmnd->request)];

	sqset = &hw->sqset[ln->portid][blk_mq_rq_cpu(scsi_cmd_to_rq(cmnd))];



	nr = fc_remote_port_chkready(rport);

	if (nr) {
@@ -1989,13 +1989,13 @@ csio_eh_abort_handler(struct scsi_cmnd *cmnd) 
		csio_info(hw,

			"Aborted SCSI command to (%d:%llu) tag %u\n",

			cmnd->device->id, cmnd->device->lun,

			cmnd->request->tag);

			scsi_cmd_to_rq(cmnd)->tag);

		return SUCCESS;

	} else {

		csio_info(hw,

			"Failed to abort SCSI command, (%d:%llu) tag %u\n",

			cmnd->device->id, cmnd->device->lun,

			cmnd->request->tag);

			scsi_cmd_to_rq(cmnd)->tag);

		return FAILED;

	}

}