diff options
| author | sreekanth.reddy@lsi.com <sreekanth.reddy@lsi.com> | 2012-07-17 12:26:13 +0200 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2012-08-24 11:10:27 +0200 |
| commit | 14aa7f7eaf8bb1443d043615d8b4827821292204 (patch) | |
| tree | 14b8bb0fb01564aac67672fce99374ccfd1acbe6 /drivers/scsi/mpt2sas | |
| parent | [SCSI] mpt2sas: Fix for staged device discovery functionality of driver not w... (diff) | |
| download | linux-14aa7f7eaf8bb1443d043615d8b4827821292204.tar.xz linux-14aa7f7eaf8bb1443d043615d8b4827821292204.zip | |
[SCSI] mpt2sas: Fix for With post diag reset same set of device gets added, removed and then again gets added with new target ids
When device discovery is disabled during driver load time using module
parameter "disable_discovery=1" and when diag reset is issued then from logs,
it is observed that the devices get added, removed and then added with new
target ids.
So, in order to limit this turn-off the code which is deleting and devices
across host reset when the disable_discovery module parameter is turned on.
Signed-off-by: Sreekanth Reddy <sreekanth.reddy@lsi.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi/mpt2sas')
| -rw-r--r-- | drivers/scsi/mpt2sas/mpt2sas_scsih.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/mpt2sas/mpt2sas_scsih.c b/drivers/scsi/mpt2sas/mpt2sas_scsih.c index 66c773662694..7d774c5ffcee 100644 --- a/drivers/scsi/mpt2sas/mpt2sas_scsih.c +++ b/drivers/scsi/mpt2sas/mpt2sas_scsih.c @@ -7264,7 +7264,8 @@ mpt2sas_scsih_reset_handler(struct MPT2SAS_ADAPTER *ioc, int reset_phase) _scsih_search_responding_sas_devices(ioc); _scsih_search_responding_raid_devices(ioc); _scsih_search_responding_expanders(ioc); - if (!ioc->is_driver_loading) { + if ((!ioc->is_driver_loading) && !(disable_discovery > 0 && + !ioc->sas_hba.num_phys)) { _scsih_prep_device_scan(ioc); _scsih_search_responding_sas_devices(ioc); _scsih_search_responding_raid_devices(ioc); |