From ad889028b96af00dfe3e52e4c637d9615862d44e Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Thu, 19 Jan 2012 18:43:08 -0800 Subject: [PATCH] --- yaml --- r: 293025 b: refs/heads/master c: c666aae6919114d6cff789d79f80cfa85f3a7339 h: refs/heads/master i: 293023: dbb58864571af4d8c08f1324eb2895f85e5addaa v: v3 --- [refs] | 2 +- trunk/drivers/scsi/libsas/sas_expander.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 8b8129a475bf..8566ce5308bc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 354cf82980e2449e71fdaa3c6f170357ebd65467 +refs/heads/master: c666aae6919114d6cff789d79f80cfa85f3a7339 diff --git a/trunk/drivers/scsi/libsas/sas_expander.c b/trunk/drivers/scsi/libsas/sas_expander.c index 7e2d3c4c6171..d63f0fbcd103 100644 --- a/trunk/drivers/scsi/libsas/sas_expander.c +++ b/trunk/drivers/scsi/libsas/sas_expander.c @@ -2005,6 +2005,15 @@ static int sas_rediscover_dev(struct domain_device *dev, int phy_id, bool last) return res; } + /* delete the old link */ + if (SAS_ADDR(phy->attached_sas_addr) && + SAS_ADDR(sas_addr) != SAS_ADDR(phy->attached_sas_addr)) { + SAS_DPRINTK("ex %016llx phy 0x%x replace %016llx\n", + SAS_ADDR(dev->sas_addr), phy_id, + SAS_ADDR(phy->attached_sas_addr)); + sas_unregister_devs_sas_addr(dev, phy_id, last); + } + return sas_discover_new(dev, phy_id); }