2 files changed, 17 insertions, 0 deletions

diff --git a/drivers/scsi/fnic/fnic.h b/drivers/scsi/fnic/fnic.h
index 9ddc9200e0a4..9e4b7709043e 100644
--- a/drivers/scsi/fnic/fnic.h
+++ b/drivers/scsi/fnic/fnic.h
@@ -248,6 +248,7 @@ struct fnic {
         struct completion *remove_wait; /* device remove thread blocks */
 
         atomic_t in_flight;             /* io counter */
+        bool internal_reset_inprogress;
         u32 _reserved;                  /* fill hole */
         unsigned long state_flags;      /* protected by host lock */
         enum fnic_state state;
diff --git a/drivers/scsi/fnic/fnic_scsi.c b/drivers/scsi/fnic/fnic_scsi.c
index 2544a37ece0a..adb3d5871e74 100644
--- a/drivers/scsi/fnic/fnic_scsi.c
+++ b/drivers/scsi/fnic/fnic_scsi.c
@@ -2581,6 +2581,19 @@ int fnic_host_reset(struct scsi_cmnd *sc)
         unsigned long wait_host_tmo;
         struct Scsi_Host *shost = sc->device->host;
         struct fc_lport *lp = shost_priv(shost);
+        struct fnic *fnic = lport_priv(lp);
+        unsigned long flags;
+
+        spin_lock_irqsave(&fnic->fnic_lock, flags);
+        if (fnic->internal_reset_inprogress == 0) {
+                fnic->internal_reset_inprogress = 1;
+        } else {
+                spin_unlock_irqrestore(&fnic->fnic_lock, flags);
+                FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host,
+                        "host reset in progress skipping another host reset\n");
+                return SUCCESS;
+        }
+        spin_unlock_irqrestore(&fnic->fnic_lock, flags);
 
         /*
          * If fnic_reset is successful, wait for fabric login to complete
@@ -2601,6 +2614,9 @@ int fnic_host_reset(struct scsi_cmnd *sc)
                 }
         }
 
+        spin_lock_irqsave(&fnic->fnic_lock, flags);
+        fnic->internal_reset_inprogress = 0;
+        spin_unlock_irqrestore(&fnic->fnic_lock, flags);
         return ret;
 }