[25/51] lpfc: use fc_block_rport()

Message ID	20210817091456.73342-26-hare@suse.de
State	New
Headers	show Return-Path: <linux-scsi-owner@kernel.org> From: Hannes Reinecke <hare@suse.de> To: "Martin K. Petersen" <martin.petersen@oracle.com> Cc: Christoph Hellwig <hch@lst.de>, James Bottomley <james.bottomley@hansenpartnership.com>, linux-scsi@vger.kernel.org, Hannes Reinecke <hare@suse.de>, James Smart <james.smart@broadcom.com> Subject: [PATCH 25/51] lpfc: use fc_block_rport() Date: Tue, 17 Aug 2021 11:14:30 +0200 Message-Id: <20210817091456.73342-26-hare@suse.de> In-Reply-To: <20210817091456.73342-1-hare@suse.de> References: <20210817091456.73342-1-hare@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	SCSI EH argument reshuffle part II \| expand [PATCHv2,00/51] SCSI EH argument reshuffle part II [01/51] lpfc: kill lpfc_bus_reset_handler [02/51] lpfc: drop lpfc_no_handler() [03/51] sym53c8xx_2: split off bus reset from host reset [04/51] ips: Do not try to abort command from host reset [05/51] snic: reserve tag for TMF [06/51] qla1280: separate out host reset function from qla1280_error_action() [07/51] megaraid: pass in NULL scb for host reset [08/51] zfcp: open-code fc_block_scsi_eh() for host reset [09/51] mpi3mr: split off bus_reset function from host_reset [10/51] scsi: Use Scsi_Host as argument for eh_host_reset_handler [11/51] mptfc: simplify mpt_fc_block_error_handler() [12/51] mptfusion: correct definitions for mptscsih_dev_reset() [13/51] mptfc: open-code mptfc_block_error_handler() for bus reset [14/51] pmcraid: Select device in pmcraid_eh_bus_reset_handler() [15/51] qla2xxx: open-code qla2xxx_generic_reset() [16/51] qla2xxx: Do not call fc_block_scsi_eh() during bus reset [17/51] visorhba: select first device on the bus for bus_reset() [18/51] ncr53c8xx: remove 'sync_reset' argument from ncr_reset_bus() [19/51] ncr53c8xx: Complete all commands during bus reset [20/51] ncr53c8xx: Remove unused code [21/51] scsi: Use Scsi_Host and channel number as argument for eh_bus_reset_handler() [22/51] libiscsi: use cls_session as argument for target and session reset [23/51] bnx2fc: Do not rely on a scsi command when issueing lun or target reset [24/51] ibmvfc: open-code reset loop for target reset [25/51] lpfc: use fc_block_rport() [26/51] lpfc: use rport as argument for lpfc_send_taskmgmt() [27/51] lpfc: use rport as argument for lpfc_chk_tgt_mapped() [28/51] csiostor: use fc_block_rport() [29/51] qla2xxx: use fc_block_rport() [30/51] fc_fcp: use fc_block_rport() [31/51] qedf: use fc rport as argument for qedf_initiate_tmf() [32/51] sym53c8xx_2: rework reset handling [33/51] bfa: Do not use scsi command to signal TMF status [34/51] scsi_transport_iscsi: use session as argument for iscsi_block_scsi_eh() [35/51] pmcraid: select first available device for target reset [36/51] scsi: Use scsi_target as argument for eh_target_reset_handler() [37/51] aha152x: look for stuck command when resetting device [38/51] fnic: use dedicated device reset command [39/51] a1000u2w: do not rely on the command for inia100_device_reset() [40/51] aic7xxx: use scsi device as argument for BUILD_SCSIID() [41/51] aic79xx: use scsi device as argument for BUILD_SCSIID() [42/51] aic7xxx: do not reference scsi command when resetting device [43/51] aic79xx: do not reference scsi command when resetting device [44/51] xen-scsifront: add scsi device as argument to scsifront_do_request() [45/51] fas216: Rework device reset to not rely on SCSI command pointer [46/51] csiostor: use separate TMF command [47/51] snic: use dedicated device reset command [48/51] snic: Use scsi_host_busy_iter() to traverse commands [49/51] scsi: Move eh_device_reset_handler() to use scsi_device as argument [50/51] scsi: Do not allocate scsi command in scsi_ioctl_reset() [51/51] scsi_error: streamline scsi_eh_bus_device_reset()

Message ID

20210817091456.73342-26-hare@suse.de

State

New

Headers

From: Hannes Reinecke <hare@suse.de>
To: "Martin K. Petersen" <martin.petersen@oracle.com>
Cc: Christoph Hellwig <hch@lst.de>,
	James Bottomley <james.bottomley@hansenpartnership.com>,
	linux-scsi@vger.kernel.org, Hannes Reinecke <hare@suse.de>,
	James Smart <james.smart@broadcom.com>
Subject: [PATCH 25/51] lpfc: use fc_block_rport()
Date: Tue, 17 Aug 2021 11:14:30 +0200
Message-Id: <20210817091456.73342-26-hare@suse.de>
In-Reply-To: <20210817091456.73342-1-hare@suse.de>
References: <20210817091456.73342-1-hare@suse.de>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

Series

SCSI EH argument reshuffle part II | expand

Commit Message

Hannes Reinecke Aug. 17, 2021, 9:14 a.m. UTC

Use fc_block_rport() instead of fc_block_scsi_eh() as the SCSI command
will be removed as argument for SCSI EH functions.

Signed-off-by: Hannes Reinecke <hare@suse.de>
Cc: James Smart <james.smart@broadcom.com>
---
 drivers/scsi/lpfc/lpfc_scsi.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c
index d68c08af5514..0bbf767f7253 100644
--- a/drivers/scsi/lpfc/lpfc_scsi.c
+++ b/drivers/scsi/lpfc/lpfc_scsi.c
@@ -5727,6 +5727,7 @@  static int
 lpfc_abort_handler(struct scsi_cmnd *cmnd)
 {
 	struct Scsi_Host  *shost = cmnd->device->host;
+	struct fc_rport *rport = starget_to_rport(scsi_target(cmnd->device));
 	struct lpfc_vport *vport = (struct lpfc_vport *) shost->hostdata;
 	struct lpfc_hba   *phba = vport->phba;
 	struct lpfc_iocbq *iocb;
@@ -5738,7 +5739,7 @@  lpfc_abort_handler(struct scsi_cmnd *cmnd)
 	unsigned long flags;
 	DECLARE_WAIT_QUEUE_HEAD_ONSTACK(waitq);
 
-	status = fc_block_scsi_eh(cmnd);
+	status = fc_block_rport(rport);
 	if (status != 0 && status != SUCCESS)
 		return status;
 
@@ -6187,6 +6188,7 @@  static int
 lpfc_device_reset_handler(struct scsi_cmnd *cmnd)
 {
 	struct Scsi_Host  *shost = cmnd->device->host;
+	struct fc_rport *rport = starget_to_rport(scsi_target(cmnd->device));
 	struct lpfc_vport *vport = (struct lpfc_vport *) shost->hostdata;
 	struct lpfc_rport_data *rdata;
 	struct lpfc_nodelist *pnode;
@@ -6196,7 +6198,7 @@  lpfc_device_reset_handler(struct scsi_cmnd *cmnd)
 	int status;
 	u32 logit = LOG_FCP;
 
-	rdata = lpfc_rport_data_from_scsi_device(cmnd->device);
+	rdata = rport->dd_data;
 	if (!rdata || !rdata->pnode) {
 		lpfc_printf_vlog(vport, KERN_ERR, LOG_TRACE_EVENT,
 				 "0798 Device Reset rdata failure: rdata x%px\n",
@@ -6204,7 +6206,7 @@  lpfc_device_reset_handler(struct scsi_cmnd *cmnd)
 		return FAILED;
 	}
 	pnode = rdata->pnode;
-	status = fc_block_scsi_eh(cmnd);
+	status = fc_block_rport(rport);
 	if (status != 0 && status != SUCCESS)
 		return status;
 
@@ -6261,6 +6263,7 @@  static int
 lpfc_target_reset_handler(struct scsi_cmnd *cmnd)
 {
 	struct Scsi_Host  *shost = cmnd->device->host;
+	struct fc_rport *rport = starget_to_rport(scsi_target(cmnd->device));
 	struct lpfc_vport *vport = (struct lpfc_vport *) shost->hostdata;
 	struct lpfc_rport_data *rdata;
 	struct lpfc_nodelist *pnode;
@@ -6273,7 +6276,7 @@  lpfc_target_reset_handler(struct scsi_cmnd *cmnd)
 	unsigned long flags;
 	DECLARE_WAIT_QUEUE_HEAD_ONSTACK(waitq);
 
-	rdata = lpfc_rport_data_from_scsi_device(cmnd->device);
+	rdata = rport->dd_data;
 	if (!rdata || !rdata->pnode) {
 		lpfc_printf_vlog(vport, KERN_ERR, LOG_TRACE_EVENT,
 				 "0799 Target Reset rdata failure: rdata x%px\n",
@@ -6281,7 +6284,7 @@  lpfc_target_reset_handler(struct scsi_cmnd *cmnd)
 		return FAILED;
 	}
 	pnode = rdata->pnode;
-	status = fc_block_scsi_eh(cmnd);
+	status = fc_block_rport(rport);
 	if (status != 0 && status != SUCCESS)
 		return status;

[25/51] lpfc: use fc_block_rport()

Commit Message

Patch