scsi: fnic: changing queue command to return result DID_IMM_RETRY when rport is init

Currently the queue command returns DID_NO_CONNECT anytime the rport is
not in RPORT_ST_READY state. Changing it to return DID_NO_CONNECT only
when the rport is in RPORT_ST_DELETE state. When the rport is in one of
the init states retruning DID_IMM_RETRY.

Orabug: 26670341

Signed-off-by: Sesidhar Baddela <sebaddel@cisco.com>
Signed-off-by: Satish Kharat <satishkh@cisco.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
(cherry picked from commit 4a1108d6caf7cd0f15d439bee6163ba00c7c1b33)
Signed-off-by: Joe Jin <joe.jin@oracle.com>

diff --git a/drivers/scsi/fnic/fnic_scsi.c b/drivers/scsi/fnic/fnic_scsi.c
index 26ff3f0df92ac02283ce8e112dc4e2c94df4e809..ac9f0034d0acda81f1a3597be770e80bd16f379f 100644 (file)
--- a/drivers/scsi/fnic/fnic_scsi.c
+++ b/drivers/scsi/fnic/fnic_scsi.c
@@ -450,15 +450,27 @@ static int fnic_queuecommand_lck(struct scsi_cmnd *sc, void (*done)(struct scsi_
        }
 
        rp = rport->dd_data;
-       if (!rp || rp->rp_state != RPORT_ST_READY) {
+       if (!rp || rp->rp_state == RPORT_ST_DELETE) {
                FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host,
-                               "returning DID_NO_CONNECT for IO as rport is removed\n");
+                       "rport 0x%x removed, returning DID_NO_CONNECT\n",
+                       rport->port_id);
+
                atomic64_inc(&fnic_stats->misc_stats.rport_not_ready);
                sc->result = DID_NO_CONNECT<<16;
                done(sc);
                return 0;
        }
 
+       if (rp->rp_state != RPORT_ST_READY) {
+               FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host,
+                       "rport 0x%x in state 0x%x, returning DID_IMM_RETRY\n",
+                       rport->port_id, rp->rp_state);
+
+               sc->result = DID_IMM_RETRY << 16;
+               done(sc);
+               return 0;
+       }
+
        if (lp->state != LPORT_ST_READY || !(lp->link_up))
                return SCSI_MLQUEUE_HOST_BUSY;