[SCSI] libfc: fix indefinite rport restart

Remote ports were restarting indefinitely after getting
rejects in PRLI.

Fix by adding a counter of restarts and limiting that with
the port login retry limit as well.

Signed-off-by: Joe Eykholt <jeykholt@cisco.com>
Signed-off-by: Robert Love <robert.w.love@intel.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>

1 files changed, 5 insertions, 1 deletions

diff --git a/drivers/scsi/libfc/fc_rport.c b/drivers/scsi/libfc/fc_rport.c
index d385efc68c15..363cde30c940 100644
--- a/drivers/scsi/libfc/fc_rport.c
+++ b/drivers/scsi/libfc/fc_rport.c
@@ -257,6 +257,7 @@ static void fc_rport_work(struct work_struct *work)
         case RPORT_EV_READY:
                 ids = rdata->ids;
                 rdata->event = RPORT_EV_NONE;
+                rdata->major_retries = 0;
                 kref_get(&rdata->kref);
                 mutex_unlock(&rdata->rp_mutex);
 
@@ -323,7 +324,10 @@ static void fc_rport_work(struct work_struct *work)
                         if (port_id == FC_FID_DIR_SERV) {
                                 rdata->event = RPORT_EV_NONE;
                                 mutex_unlock(&rdata->rp_mutex);
-                        } else if (rdata->flags & FC_RP_STARTED) {
+                        } else if ((rdata->flags & FC_RP_STARTED) &&
+                                   rdata->major_retries <
+                                   lport->max_rport_retry_count) {
+                                rdata->major_retries++;
                                 rdata->event = RPORT_EV_NONE;
                                 FC_RPORT_DBG(rdata, "work restart\n");
                                 fc_rport_enter_plogi(rdata);