[10/24] ibmvfc: use fc_block_rport()

Message ID	20220502213820.3187-11-hare@suse.de
State	Superseded
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> Subject: [PATCH 10/24] ibmvfc: use fc_block_rport() Date: Mon, 2 May 2022 23:38:06 +0200 Message-Id: <20220502213820.3187-11-hare@suse.de> In-Reply-To: <20220502213820.3187-1-hare@suse.de> References: <20220502213820.3187-1-hare@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	[01/24] csiostor: use fc_block_rport() \| expand [01/24] csiostor: use fc_block_rport() [02/24] fc_fcp: use fc_block_rport() [05/24] mptfusion: correct definitions for mptscsih_dev_reset() [08/24] bnx2fc: Do not rely on a scsi command for lun or target reset [10/24] ibmvfc: use fc_block_rport() [12/24] fnic: use fc_block_rport() correctly [13/24] aic7xxx: make BUILD_SCSIID() a function [16/24] aic79xx: do not reference scsi command when resetting device [17/24] snic: reserve tag for TMF [18/24] snic: use dedicated device reset command [19/24] snic: Use scsi_host_busy_iter() to traverse commands [23/24] megaraid: pass in NULL scb for host reset

Message ID

20220502213820.3187-11-hare@suse.de

State

Superseded

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>
Subject: [PATCH 10/24] ibmvfc: use fc_block_rport()
Date: Mon,  2 May 2022 23:38:06 +0200
Message-Id: <20220502213820.3187-11-hare@suse.de>
In-Reply-To: <20220502213820.3187-1-hare@suse.de>
References: <20220502213820.3187-1-hare@suse.de>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

Series

[01/24] csiostor: use fc_block_rport() | expand

Use fc_block_rport() instead of fc_block_scsi_eh() as the latter will be deprecated. Signed-off-by: Hannes Reinecke <hare@suse.de> --- drivers/scsi/ibmvscsi/ibmvfc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)

Comments

Christoph Hellwig May 3, 2022, 2:09 p.m. UTC | #1

On Mon, May 02, 2022 at 11:38:06PM +0200, Hannes Reinecke wrote:
> Use fc_block_rport() instead of fc_block_scsi_eh() as the latter
> will be deprecated.

Looks good:

Reviewed-by: Christoph Hellwig <hch@lst.de>

Johannes Thumshirn May 3, 2022, 3:20 p.m. UTC | #2

Looks good,
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>

diff --git a/drivers/scsi/ibmvscsi/ibmvfc.c b/drivers/scsi/ibmvscsi/ibmvfc.c
index 721d965f4b0e..2e7128f0d905 100644
--- a/drivers/scsi/ibmvscsi/ibmvfc.c
+++ b/drivers/scsi/ibmvscsi/ibmvfc.c
@@ -2857,12 +2857,13 @@  static int ibmvfc_abort_task_set(struct scsi_device *sdev)
 static int ibmvfc_eh_abort_handler(struct scsi_cmnd *cmd)
 {
 	struct scsi_device *sdev = cmd->device;
+	struct fc_rport *rport = starget_to_rport(scsi_target(sdev));
 	struct ibmvfc_host *vhost = shost_priv(sdev->host);
 	int cancel_rc, block_rc;
 	int rc = FAILED;
 
 	ENTER;
-	block_rc = fc_block_scsi_eh(cmd);
+	block_rc = fc_block_rport(rport);
 	ibmvfc_wait_while_resetting(vhost);
 	if (block_rc != FAST_IO_FAIL) {
 		cancel_rc = ibmvfc_cancel_all(sdev, IBMVFC_TMF_ABORT_TASK_SET);
@@ -2890,12 +2891,13 @@  static int ibmvfc_eh_abort_handler(struct scsi_cmnd *cmd)
 static int ibmvfc_eh_device_reset_handler(struct scsi_cmnd *cmd)
 {
 	struct scsi_device *sdev = cmd->device;
+	struct fc_rport *rport = starget_to_rport(scsi_target(sdev));
 	struct ibmvfc_host *vhost = shost_priv(sdev->host);
 	int cancel_rc, block_rc, reset_rc = 0;
 	int rc = FAILED;
 
 	ENTER;
-	block_rc = fc_block_scsi_eh(cmd);
+	block_rc = fc_block_rport(rport);
 	ibmvfc_wait_while_resetting(vhost);
 	if (block_rc != FAST_IO_FAIL) {
 		cancel_rc = ibmvfc_cancel_all(sdev, IBMVFC_TMF_LUN_RESET);

[10/24] ibmvfc: use fc_block_rport()

Commit Message

Comments

Patch