mpt2sas: Early return from function if shost is in recovery.
PATCH 4/11 mpt2sas: Early return from function if shost is in recovery.
Aded checks for shost_recovery flag for early return from function.
Signed-off-by Kashyap Desai <[email protected]>
---
drivers/scsi/mpt2sas/mpt2sas_base.c +2 -0
@@ -3518,7 +3518,9 @@ mpt2sas_base_free_resources(struct MPT2SAS_ADAPTER *ioc) __func__));_base_mask_interrupts (ioc); + ioc->shost_recovery =1 ;_base_make_ioc_ready (ioc,CAN_SLEEP ,SOFT_RESET ); + ioc->shost_recovery =0 ;if (ioc->pci_irq) {synchronize_irq (pdev->irq);free_irq (ioc->pci_irq, ioc);
drivers/scsi/mpt2sas/mpt2sas_scsih.c +3 -3
@@ -1978,7 +1978,7 @@ mpt2sas_scsih_issue_tm(struct MPT2SAS_ADAPTER *ioc, u16 handle, uint lun,return ; } -if (ioc->shost_recovery) { +if (ioc->shost_recovery || ioc->remove_host) {printk (MPT2SAS_INFO_FMT "%s: host reset in progress!\n" , __func__, ioc->name);return ;
@@ -4245,7 +4245,7 @@ _scsih_sas_topology_change_event(struct MPT2SAS_ADAPTER *ioc,_scsih_sas_topology_change_event_debug (ioc, event_data);#endif -if (ioc->shost_recovery) +if (ioc->shost_recovery || ioc->remove_host)return ;if (!ioc->sas_hba.num_phys)
@@ -4284,7 +4284,7 @@ _scsih_sas_topology_change_event(struct MPT2SAS_ADAPTER *ioc, "expander event\n", ioc->name));return ; } -if (ioc->shost_recovery) +if (ioc->shost_recovery || ioc->remove_host)return ; phy_number = event_data->StartPhyNum + i; reason_code = event_data->PHY[i].PhyStatus &