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

scsi: megaraid: 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-29-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 4221c8a4

drivers/scsi/megaraid/megaraid_sas_base.c

+2 −2
Original line number Diff line number Diff line
@@ -1451,10 +1451,10 @@ megasas_build_dcdb(struct megasas_instance *instance, struct scsi_cmnd *scp, 
	 * pthru timeout to the os layer timeout value.

	 */

	if (scp->device->type == TYPE_TAPE) {

		if ((scp->request->timeout / HZ) > 0xFFFF)

		if (scsi_cmd_to_rq(scp)->timeout / HZ > 0xFFFF)

			pthru->timeout = cpu_to_le16(0xFFFF);

		else

			pthru->timeout = cpu_to_le16(scp->request->timeout / HZ);

			pthru->timeout = cpu_to_le16(scsi_cmd_to_rq(scp)->timeout / HZ);

	}



	/*

drivers/scsi/megaraid/megaraid_sas_fusion.c

+5 −5
Original line number Diff line number Diff line
@@ -402,7 +402,7 @@ megasas_get_msix_index(struct megasas_instance *instance, 
			(mega_mod64(atomic64_add_return(1, &instance->total_io_count),

				instance->msix_vectors));

	} else if (instance->host->nr_hw_queues > 1) {

		u32 tag = blk_mq_unique_tag(scmd->request);

		u32 tag = blk_mq_unique_tag(scsi_cmd_to_rq(scmd));



		cmd->request_desc->SCSIIO.MSIxIndex = blk_mq_unique_tag_to_hwq(tag) +

			instance->low_latency_index_start;
@@ -3023,7 +3023,7 @@ static void megasas_build_ld_nonrw_fusion(struct megasas_instance *instance, 
		io_request->DevHandle = cpu_to_le16(device_id);

		io_request->LUN[1] = scmd->device->lun;

		pRAID_Context->timeout_value =

			cpu_to_le16 (scmd->request->timeout / HZ);

			cpu_to_le16(scsi_cmd_to_rq(scmd)->timeout / HZ);

		cmd->request_desc->SCSIIO.RequestFlags =

			(MPI2_REQ_DESCRIPT_FLAGS_SCSI_IO <<

			MEGASAS_REQ_DESCRIPT_FLAGS_TYPE_SHIFT);
@@ -3086,7 +3086,7 @@ megasas_build_syspd_fusion(struct megasas_instance *instance, 


	device_id = MEGASAS_DEV_INDEX(scmd);

	pd_index = MEGASAS_PD_INDEX(scmd);

	os_timeout_value = scmd->request->timeout / HZ;

	os_timeout_value = scsi_cmd_to_rq(scmd)->timeout / HZ;

	mr_device_priv_data = scmd->device->hostdata;

	cmd->pd_interface = mr_device_priv_data->interface_type;
@@ -3381,7 +3381,7 @@ megasas_build_and_issue_cmd_fusion(struct megasas_instance *instance, 
		return SCSI_MLQUEUE_HOST_BUSY;

	}



	cmd = megasas_get_cmd_fusion(instance, scmd->request->tag);

	cmd = megasas_get_cmd_fusion(instance, scsi_cmd_to_rq(scmd)->tag);



	if (!cmd) {

		atomic_dec(&instance->fw_outstanding);
@@ -3422,7 +3422,7 @@ megasas_build_and_issue_cmd_fusion(struct megasas_instance *instance, 
	 */

	if (cmd->r1_alt_dev_handle != MR_DEVHANDLE_INVALID) {

		r1_cmd = megasas_get_cmd_fusion(instance,

				(scmd->request->tag + instance->max_fw_cmds));

				scsi_cmd_to_rq(scmd)->tag + instance->max_fw_cmds);

		megasas_prepare_secondRaid1_IO(instance, cmd, r1_cmd);

	}