Added changes to pass a new argument to fc_remote_port_chkready Signed-off-by: Muneendra <muneendra.kumar@xxxxxxxxxxxx> --- v3: New Patch --- drivers/scsi/fnic/fnic_main.c | 2 +- drivers/scsi/fnic/fnic_scsi.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/scsi/fnic/fnic_main.c b/drivers/scsi/fnic/fnic_main.c index 5f8a7ef8f6a8..f312b4be2846 100644 --- a/drivers/scsi/fnic/fnic_main.c +++ b/drivers/scsi/fnic/fnic_main.c @@ -100,7 +100,7 @@ static int fnic_slave_alloc(struct scsi_device *sdev) { struct fc_rport *rport = starget_to_rport(scsi_target(sdev)); - if (!rport || fc_remote_port_chkready(rport)) + if (!rport || fc_remote_port_chkready(rport, NULL)) return -ENXIO; scsi_change_queue_depth(sdev, fnic_max_qdepth); diff --git a/drivers/scsi/fnic/fnic_scsi.c b/drivers/scsi/fnic/fnic_scsi.c index d1f7b84bbfe8..943b2bf7aaa4 100644 --- a/drivers/scsi/fnic/fnic_scsi.c +++ b/drivers/scsi/fnic/fnic_scsi.c @@ -452,7 +452,7 @@ static int fnic_queuecommand_lck(struct scsi_cmnd *sc, void (*done)(struct scsi_ return 0; } - ret = fc_remote_port_chkready(rport); + ret = fc_remote_port_chkready(rport, sc); if (ret) { FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host, "rport is not ready\n"); @@ -1938,7 +1938,7 @@ int fnic_abort_cmd(struct scsi_cmnd *sc) * port is up, then send abts to the remote port to terminate * the IO. Else, just locally terminate the IO in the firmware */ - if (fc_remote_port_chkready(rport) == 0) + if (fc_remote_port_chkready(rport, sc) == 0) task_req = FCPIO_ITMF_ABT_TASK; else { atomic64_inc(&fnic_stats->misc_stats.rport_not_ready); @@ -2364,7 +2364,7 @@ int fnic_device_reset(struct scsi_cmnd *sc) goto fnic_device_reset_end; /* Check if remote port up */ - if (fc_remote_port_chkready(rport)) { + if (fc_remote_port_chkready(rport, sc)) { atomic64_inc(&fnic_stats->misc_stats.rport_not_ready); goto fnic_device_reset_end; } -- 2.26.2
Attachment:
smime.p7s
Description: S/MIME Cryptographic Signature