[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>

diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c
index 81ce39d166d1bdb56d84abba2b8c6df525ef4842..2fc5a3961ca69d8b4d1878d193f701fe1b903583 100644 (file)
--- a/drivers/scsi/libsas/sas_ata.c
+++ b/drivers/scsi/libsas/sas_ata.c
@@ -184,7 +184,7 @@ static unsigned int sas_ata_qc_issue(struct ata_queued_cmd *qc)
        spin_unlock(ap->lock);
 
        /* If the device fell off, no sense in issuing commands */
-       if (dev->gone)
+       if (test_bit(SAS_DEV_GONE, &dev->state))
                goto out;
 
        task = sas_alloc_task(GFP_ATOMIC);

diff --git a/drivers/scsi/libsas/sas_expander.c b/drivers/scsi/libsas/sas_expander.c
index 15d2239a378bb32758b4df510ae5043934e1ca70..f33d0c9911c4ac8614c44c84ccf7a39032f375b0 100644 (file)
--- 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
        struct domain_device *child, *n;
 
        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 ||
                    child->dev_type == FANOUT_DEV)
                        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) {
                        if (SAS_ADDR(child->sas_addr) ==
                            SAS_ADDR(phy->attached_sas_addr)) {
-                               child->gone = 1;
+                               set_bit(SAS_DEV_GONE, &child->state);
                                if (child->dev_type == EDGE_DEV ||
                                    child->dev_type == FANOUT_DEV)
                                        sas_unregister_ex_tree(parent->port, child);
@@ -1780,7 +1780,7 @@ static void sas_unregister_devs_sas_addr(struct domain_device *parent,
                                break;
                        }
                }
-               parent->gone = 1;
+               set_bit(SAS_DEV_GONE, &parent->state);
                sas_disable_routing(parent, phy->attached_sas_addr);
        }
        memset(phy->attached_sas_addr, 0, SAS_ADDR_SIZE);

diff --git a/drivers/scsi/libsas/sas_port.c b/drivers/scsi/libsas/sas_port.c
index a47c7a75327b4316d0c4bd5138247e43f4979e9c..d88e55f9732b44f5e3252fc9869403275d7c865e 100644 (file)
--- a/drivers/scsi/libsas/sas_port.c
+++ b/drivers/scsi/libsas/sas_port.c
@@ -171,7 +171,7 @@ void sas_deform_port(struct asd_sas_phy *phy, int gone)
 
        if (port->num_phys == 1) {
                if (dev && gone)
-                       dev->gone = 1;
+                       set_bit(SAS_DEV_GONE, &dev->state);
                sas_unregister_domain_devices(port);
                sas_port_delete(port->port);
                port->port = NULL;

diff --git a/drivers/scsi/libsas/sas_scsi_host.c b/drivers/scsi/libsas/sas_scsi_host.c
index fd60465d4b2d4abbe60e2b2a042e460a54c9b578..15533a17eb97a45699a815af0b305938ee402ef9 100644 (file)
--- a/drivers/scsi/libsas/sas_scsi_host.c
+++ b/drivers/scsi/libsas/sas_scsi_host.c
@@ -192,7 +192,7 @@ int sas_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd)
        int res = 0;
 
        /* 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;
                goto out_done;
        }

diff --git a/include/scsi/libsas.h b/include/scsi/libsas.h
index 42900fa95a03b528a744ccd9d3a8b7fc2e725f98..d792b13cfcf5426c3e9c9b9b59305a343d404359 100644 (file)
--- a/include/scsi/libsas.h
+++ b/include/scsi/libsas.h
@@ -173,7 +173,10 @@ struct sata_device {
        struct ata_taskfile tf;
 };
 
-/* ---------- Domain device ---------- */
+enum {
+       SAS_DEV_GONE,
+};
+
 struct domain_device {
         enum sas_dev_type dev_type;
 
@@ -205,7 +208,7 @@ struct domain_device {
         };
 
         void *lldd_dev;
-       int gone;
+       unsigned long state;
        struct kref kref;
 };