aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/libsas/sas_expander.c
diff options
context:
space:
mode:
authorDan Williams <dan.j.williams@intel.com>2012-01-07 03:52:39 -0500
committerJames Bottomley <JBottomley@Parallels.com>2012-02-19 14:51:23 -0500
commite139942d77a6e3ac83bc322e826668054a8601d6 (patch)
treeef1741122d936f6fa9986a53f17e6f6108283649 /drivers/scsi/libsas/sas_expander.c
parent312d3e56119a4bc5c36a96818f87f650c069ddc2 (diff)
[SCSI] libsas: convert dev->gone to flags
In preparation for adding tracking of another device state "destroy". Signed-off-by: Dan Williams <dan.j.williams@intel.com> Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi/libsas/sas_expander.c')
-rw-r--r--drivers/scsi/libsas/sas_expander.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/scsi/libsas/sas_expander.c b/drivers/scsi/libsas/sas_expander.c
index 15d2239a378b..f33d0c9911c4 100644
--- a/drivers/scsi/libsas/sas_expander.c
+++ b/drivers/scsi/libsas/sas_expander.c
@@ -1750,7 +1750,7 @@ static void sas_unregister_ex_tree(struct asd_sas_port *port, struct domain_devi
1750 struct domain_device *child, *n; 1750 struct domain_device *child, *n;
1751 1751
1752 list_for_each_entry_safe(child, n, &ex->children, siblings) { 1752 list_for_each_entry_safe(child, n, &ex->children, siblings) {
1753 child->gone = 1; 1753 set_bit(SAS_DEV_GONE, &child->state);
1754 if (child->dev_type == EDGE_DEV || 1754 if (child->dev_type == EDGE_DEV ||
1755 child->dev_type == FANOUT_DEV) 1755 child->dev_type == FANOUT_DEV)
1756 sas_unregister_ex_tree(port, child); 1756 sas_unregister_ex_tree(port, child);
@@ -1771,7 +1771,7 @@ static void sas_unregister_devs_sas_addr(struct domain_device *parent,
1771 &ex_dev->children, siblings) { 1771 &ex_dev->children, siblings) {
1772 if (SAS_ADDR(child->sas_addr) == 1772 if (SAS_ADDR(child->sas_addr) ==
1773 SAS_ADDR(phy->attached_sas_addr)) { 1773 SAS_ADDR(phy->attached_sas_addr)) {
1774 child->gone = 1; 1774 set_bit(SAS_DEV_GONE, &child->state);
1775 if (child->dev_type == EDGE_DEV || 1775 if (child->dev_type == EDGE_DEV ||
1776 child->dev_type == FANOUT_DEV) 1776 child->dev_type == FANOUT_DEV)
1777 sas_unregister_ex_tree(parent->port, child); 1777 sas_unregister_ex_tree(parent->port, child);
@@ -1780,7 +1780,7 @@ static void sas_unregister_devs_sas_addr(struct domain_device *parent,
1780 break; 1780 break;
1781 } 1781 }
1782 } 1782 }
1783 parent->gone = 1; 1783 set_bit(SAS_DEV_GONE, &parent->state);
1784 sas_disable_routing(parent, phy->attached_sas_addr); 1784 sas_disable_routing(parent, phy->attached_sas_addr);
1785 } 1785 }
1786 memset(phy->attached_sas_addr, 0, SAS_ADDR_SIZE); 1786 memset(phy->attached_sas_addr, 0, SAS_ADDR_SIZE);