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

Commit 39abb11a authored by Steffen Maier's avatar Steffen Maier Committed by Martin K. Petersen
Browse files

scsi: zfcp: decouple FSF request setup of TMF from scsi_cmnd 



In zfcp_fsf_fcp_task_mgmt() resolve the still old argument scsi_cmnd into
scsi_device very early and only depend on scsi_device and derived objects in
the function body.

This prepares to later change the function signature replacing the scsi_cmnd
argument with scsi_device.

Signed-off-by: default avatarSteffen Maier <maier@linux.ibm.com>
Reviewed-by: default avatarBenjamin Block <bblock@linux.ibm.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent e0116c91

drivers/s390/scsi/zfcp_fsf.c

+5 −3
Original line number Diff line number Diff line
@@ -2324,7 +2324,8 @@ struct zfcp_fsf_req *zfcp_fsf_fcp_task_mgmt(struct scsi_cmnd *scmnd, 
{

	struct zfcp_fsf_req *req = NULL;

	struct fcp_cmnd *fcp_cmnd;

	struct zfcp_scsi_dev *zfcp_sdev = sdev_to_zfcp(scmnd->device);

	struct scsi_device *sdev = scmnd->device;

	struct zfcp_scsi_dev *zfcp_sdev = sdev_to_zfcp(sdev);

	struct zfcp_qdio *qdio = zfcp_sdev->port->adapter->qdio;



	if (unlikely(!(atomic_read(&zfcp_sdev->status) &
@@ -2344,7 +2345,8 @@ struct zfcp_fsf_req *zfcp_fsf_fcp_task_mgmt(struct scsi_cmnd *scmnd, 
		goto out;

	}



	req->data = scmnd->device;

	req->data = sdev;



	req->handler = zfcp_fsf_fcp_task_mgmt_handler;

	req->qtcb->header.lun_handle = zfcp_sdev->lun_handle;

	req->qtcb->header.port_handle = zfcp_sdev->port->handle;
@@ -2355,7 +2357,7 @@ struct zfcp_fsf_req *zfcp_fsf_fcp_task_mgmt(struct scsi_cmnd *scmnd, 
	zfcp_qdio_set_sbale_last(qdio, &req->qdio_req);



	fcp_cmnd = &req->qtcb->bottom.io.fcp_cmnd.iu;

	zfcp_fc_fcp_tm(fcp_cmnd, scmnd->device, tm_flags);

	zfcp_fc_fcp_tm(fcp_cmnd, sdev, tm_flags);



	zfcp_fsf_start_timer(req, ZFCP_SCSI_ER_TIMEOUT);

	if (!zfcp_fsf_req_send(req))