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

scsi: qla4xxx: 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-40-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 c7d6b2c2

drivers/scsi/qla4xxx/ql4_iocb.c

+1 −1
Original line number Diff line number Diff line
@@ -288,7 +288,7 @@ int qla4xxx_send_command_to_isp(struct scsi_qla_host *ha, struct srb * srb) 
	/* Acquire hardware specific lock */

	spin_lock_irqsave(&ha->hardware_lock, flags);



	index = (uint32_t)cmd->request->tag;

	index = scsi_cmd_to_rq(cmd)->tag;



	/*

	 * Check to see if adapter is online before placing request on

drivers/scsi/qla4xxx/ql4_os.c

+2 −2
Original line number Diff line number Diff line
@@ -9282,7 +9282,7 @@ static int qla4xxx_eh_device_reset(struct scsi_cmnd *cmd) 
	DEBUG2(printk(KERN_INFO

		      "scsi%ld: DEVICE_RESET cmd=%p jiffies = 0x%lx, to=%x,"

		      "dpc_flags=%lx, status=%x allowed=%d\n", ha->host_no,

		      cmd, jiffies, cmd->request->timeout / HZ,

		      cmd, jiffies, scsi_cmd_to_rq(cmd)->timeout / HZ,

		      ha->dpc_flags, cmd->result, cmd->allowed));



	rval = qla4xxx_isp_check_reg(ha);
@@ -9349,7 +9349,7 @@ static int qla4xxx_eh_target_reset(struct scsi_cmnd *cmd) 
	DEBUG2(printk(KERN_INFO

		      "scsi%ld: TARGET_DEVICE_RESET cmd=%p jiffies = 0x%lx, "

		      "to=%x,dpc_flags=%lx, status=%x allowed=%d\n",

		      ha->host_no, cmd, jiffies, cmd->request->timeout / HZ,

		      ha->host_no, cmd, jiffies, scsi_cmd_to_rq(cmd)->timeout / HZ,

		      ha->dpc_flags, cmd->result, cmd->allowed));



	rval = qla4xxx_isp_check_reg(ha);