snic: target cleanup in driver unload path

Fix deletes the snic targets synchronously prior to deletion of host.

Signed-off-by: Narsimhulu Musini <nmusini@cisco.com>
Signed-off-by: Sesidhar Baddela <sebaddel@cisco.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/snic/snic_disc.c b/drivers/scsi/snic/snic_disc.c
index 5f48795767bdddc5513b31a6d40dcf4863a78fa3..b0fefd67cac35d9f1746587d2d93ecd9084fdba3 100644 (file)
--- a/drivers/scsi/snic/snic_disc.c
+++ b/drivers/scsi/snic/snic_disc.c
@@ -480,10 +480,21 @@ int
 snic_disc_start(struct snic *snic)
 {
        struct snic_disc *disc = &snic->disc;
+       unsigned long flags;
        int ret = 0;
 
        SNIC_SCSI_DBG(snic->shost, "Discovery Start.\n");
 
+       spin_lock_irqsave(&snic->snic_lock, flags);
+       if (snic->in_remove) {
+               spin_unlock_irqrestore(&snic->snic_lock, flags);
+               SNIC_ERR("snic driver removal in progress ...\n");
+               ret = 0;
+
+               return ret;
+       }
+       spin_unlock_irqrestore(&snic->snic_lock, flags);
+
        mutex_lock(&disc->mutex);
        if (disc->state == SNIC_DISC_PENDING) {
                disc->req_cnt++;
@@ -533,6 +544,8 @@ snic_tgt_del_all(struct snic *snic)
        struct list_head *cur, *nxt;
        unsigned long flags;
 
+       scsi_flush_work(snic->shost);
+
        mutex_lock(&snic->disc.mutex);
        spin_lock_irqsave(snic->shost->host_lock, flags);
 
@@ -545,7 +558,7 @@ snic_tgt_del_all(struct snic *snic)
                tgt = NULL;
        }
        spin_unlock_irqrestore(snic->shost->host_lock, flags);
-
-       scsi_flush_work(snic->shost);
        mutex_unlock(&snic->disc.mutex);
+
+       flush_workqueue(snic_glob->event_q);
 } /* end of snic_tgt_del_all */