Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 58fcf920 authored by Narsimhulu Musini's avatar Narsimhulu Musini Committed by Martin K. Petersen
Browse files

snic: target cleanup in driver unload path 



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

Signed-off-by: default avatarNarsimhulu Musini <nmusini@cisco.com>
Signed-off-by: default avatarSesidhar Baddela <sebaddel@cisco.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 6e0ae74b

drivers/scsi/snic/snic_disc.c

+15 −2
Original line number Diff line number Diff line
@@ -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 */