diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2012-06-21 23:36:15 -0700 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2012-08-02 14:37:56 +0100 |
| commit | 705c1a5ba71fc1fad9ed0f2fd15e31db2c623dfd (patch) | |
| tree | b6de3caaf60ebaedcfe048321f23f3cdf196cee0 /drivers/scsi/libsas | |
| parent | c6e92669dd2703bd2243c2b16cd5a5283135151b (diff) | |
| download | kernel_samsung_smdk4412-705c1a5ba71fc1fad9ed0f2fd15e31db2c623dfd.zip kernel_samsung_smdk4412-705c1a5ba71fc1fad9ed0f2fd15e31db2c623dfd.tar.gz kernel_samsung_smdk4412-705c1a5ba71fc1fad9ed0f2fd15e31db2c623dfd.tar.bz2 | |
libsas: continue revalidation
commit 26f2f199ff150d8876b2641c41e60d1c92d2fb81 upstream.
Continue running revalidation until no more broadcast devices are
discovered. Fixes cases where re-discovery completes too early in a
domain with multiple expanders with pending re-discovery events.
Servicing BCNs can get backed up behind error recovery.
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/scsi/libsas')
| -rw-r--r-- | drivers/scsi/libsas/sas_expander.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/scsi/libsas/sas_expander.c b/drivers/scsi/libsas/sas_expander.c index e48ba4b..6330110 100644 --- a/drivers/scsi/libsas/sas_expander.c +++ b/drivers/scsi/libsas/sas_expander.c @@ -1983,9 +1983,7 @@ int sas_ex_revalidate_domain(struct domain_device *port_dev) struct domain_device *dev = NULL; res = sas_find_bcast_dev(port_dev, &dev); - if (res) - goto out; - if (dev) { + while (res == 0 && dev) { struct expander_device *ex = &dev->ex_dev; int i = 0, phy_id; @@ -1997,8 +1995,10 @@ int sas_ex_revalidate_domain(struct domain_device *port_dev) res = sas_rediscover(dev, phy_id); i = phy_id + 1; } while (i < ex->num_phys); + + dev = NULL; + res = sas_find_bcast_dev(port_dev, &dev); } -out: return res; } |