UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

[SCSI] 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 <kashyap.desai@lsi.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
This commit is contained in:
Kashyap, Desai 2010-03-17 16:23:36 +05:30 committed by James Bottomley
parent 89009fbb7d
commit 6558bbb145
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/scsi/mpt2sas/mpt2sas_base.c
View File

@ -3521,7 +3521,9 @@ mpt2sas_base_free_resources(struct MPT2SAS_ADAPTER *ioc)
__func__)); __func__));
_base_mask_interrupts(ioc); _base_mask_interrupts(ioc);
ioc->shost_recovery = 1;
_base_make_ioc_ready(ioc, CAN_SLEEP, SOFT_RESET); _base_make_ioc_ready(ioc, CAN_SLEEP, SOFT_RESET);
ioc->shost_recovery = 0;
if (ioc->pci_irq) { if (ioc->pci_irq) {
synchronize_irq(pdev->irq); synchronize_irq(pdev->irq);
free_irq(ioc->pci_irq, ioc); free_irq(ioc->pci_irq, ioc);

6
drivers/scsi/mpt2sas/mpt2sas_scsih.c
View File

@ -1979,7 +1979,7 @@ mpt2sas_scsih_issue_tm(struct MPT2SAS_ADAPTER *ioc, u16 handle, uint lun,
return; return;
} }
if (ioc->shost_recovery) { if (ioc->shost_recovery || ioc->remove_host) {
printk(MPT2SAS_INFO_FMT "%s: host reset in progress!\n", printk(MPT2SAS_INFO_FMT "%s: host reset in progress!\n",
__func__, ioc->name); __func__, ioc->name);
return; return;
@ -4246,7 +4246,7 @@ _scsih_sas_topology_change_event(struct MPT2SAS_ADAPTER *ioc,
_scsih_sas_topology_change_event_debug(ioc, event_data); _scsih_sas_topology_change_event_debug(ioc, event_data);
#endif #endif
if (ioc->shost_recovery) if (ioc->shost_recovery || ioc->remove_host)
return; return;
if (!ioc->sas_hba.num_phys) if (!ioc->sas_hba.num_phys)
@ -4285,7 +4285,7 @@ _scsih_sas_topology_change_event(struct MPT2SAS_ADAPTER *ioc,
"expander event\n", ioc->name)); "expander event\n", ioc->name));
return; return;
} }
if (ioc->shost_recovery) if (ioc->shost_recovery || ioc->remove_host)
return; return;
phy_number = event_data->StartPhyNum + i; phy_number = event_data->StartPhyNum + i;
reason_code = event_data->PHY[i].PhyStatus & reason_code = event_data->PHY[i].PhyStatus &