hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[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>
This commit is contained in:
Dan Williams 2012-01-07 08:52:39 +00:00 committed by James Bottomley
parent 312d3e5611
commit e139942d77
5 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/scsi/libsas/sas_ata.c
View File

@ -184,7 +184,7 @@ static unsigned int sas_ata_qc_issue(struct ata_queued_cmd *qc)
spin_unlock(ap->lock); spin_unlock(ap->lock);
/* If the device fell off, no sense in issuing commands */ /* If the device fell off, no sense in issuing commands */
if (dev->gone) if (test_bit(SAS_DEV_GONE, &dev->state))
goto out; goto out;
task = sas_alloc_task(GFP_ATOMIC); task = sas_alloc_task(GFP_ATOMIC);

6
drivers/scsi/libsas/sas_expander.c
View File

@ -1750,7 +1750,7 @@ static void sas_unregister_ex_tree(struct asd_sas_port *port, struct domain_devi
struct domain_device *child, *n; struct domain_device *child, *n;
list_for_each_entry_safe(child, n, &ex->children, siblings) { list_for_each_entry_safe(child, n, &ex->children, siblings) {
child->gone = 1; set_bit(SAS_DEV_GONE, &child->state);
if (child->dev_type == EDGE_DEV || if (child->dev_type == EDGE_DEV ||
child->dev_type == FANOUT_DEV) child->dev_type == FANOUT_DEV)
sas_unregister_ex_tree(port, child); sas_unregister_ex_tree(port, child);
@ -1771,7 +1771,7 @@ static void sas_unregister_devs_sas_addr(struct domain_device *parent,
&ex_dev->children, siblings) { &ex_dev->children, siblings) {
if (SAS_ADDR(child->sas_addr) == if (SAS_ADDR(child->sas_addr) ==
SAS_ADDR(phy->attached_sas_addr)) { SAS_ADDR(phy->attached_sas_addr)) {
child->gone = 1; set_bit(SAS_DEV_GONE, &child->state);
if (child->dev_type == EDGE_DEV || if (child->dev_type == EDGE_DEV ||
child->dev_type == FANOUT_DEV) child->dev_type == FANOUT_DEV)
sas_unregister_ex_tree(parent->port, child); sas_unregister_ex_tree(parent->port, child);
@ -1780,7 +1780,7 @@ static void sas_unregister_devs_sas_addr(struct domain_device *parent,
break; break;
} }
} }
parent->gone = 1; set_bit(SAS_DEV_GONE, &parent->state);
sas_disable_routing(parent, phy->attached_sas_addr); sas_disable_routing(parent, phy->attached_sas_addr);
} }
memset(phy->attached_sas_addr, 0, SAS_ADDR_SIZE); memset(phy->attached_sas_addr, 0, SAS_ADDR_SIZE);

2
drivers/scsi/libsas/sas_port.c
View File

@ -171,7 +171,7 @@ void sas_deform_port(struct asd_sas_phy *phy, int gone)
if (port->num_phys == 1) { if (port->num_phys == 1) {
if (dev && gone) if (dev && gone)
dev->gone = 1; set_bit(SAS_DEV_GONE, &dev->state);
sas_unregister_domain_devices(port); sas_unregister_domain_devices(port);
sas_port_delete(port->port); sas_port_delete(port->port);
port->port = NULL; port->port = NULL;

2
drivers/scsi/libsas/sas_scsi_host.c
View File

@ -192,7 +192,7 @@ int sas_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd)
int res = 0; int res = 0;
/* If the device fell off, no sense in issuing commands */ /* If the device fell off, no sense in issuing commands */
if (dev->gone) { if (test_bit(SAS_DEV_GONE, &dev->state)) {
cmd->result = DID_BAD_TARGET << 16; cmd->result = DID_BAD_TARGET << 16;
goto out_done; goto out_done;
} }

7
include/scsi/libsas.h
View File

@ -173,7 +173,10 @@ struct sata_device {
struct ata_taskfile tf; struct ata_taskfile tf;
}; };
/* ---------- Domain device ---------- */ enum {
SAS_DEV_GONE,
};
struct domain_device { struct domain_device {
enum sas_dev_type dev_type; enum sas_dev_type dev_type;
@ -205,7 +208,7 @@ struct domain_device {
}; };
void *lldd_dev; void *lldd_dev;
int gone; unsigned long state;
struct kref kref; struct kref kref;
}; };