[SCSI] mpt2sas: Fix to use sas device list instead of enclosure list for _transpor_ge...

Enclosure_identifier not being returned by mpt2sas
The driver exports callback function to the sas transport layer
for obtaining the enclosure logical id.  This function is called
_transport_get_enclosure_identifier.  The driver was searching
the wrong list for the enclosure_identifier.  The driver should be
searching the sas device list instead of enclosure list.  The
sas address that is passed to the driver is for the end device, not
enclosure.

Signed-off-by: Kashyap Desai <kashyap.desai@lsi.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>

diff --git a/drivers/scsi/mpt2sas/mpt2sas_transport.c b/drivers/scsi/mpt2sas/mpt2sas_transport.c
index 2727c3b65104785883105d780e71055cf230fad9..778e149f9637ec3c016fbf2da4d9a3ba319a1586 100644 (file)
--- a/drivers/scsi/mpt2sas/mpt2sas_transport.c
+++ b/drivers/scsi/mpt2sas/mpt2sas_transport.c
@@ -1007,18 +1007,18 @@ static int
 _transport_get_enclosure_identifier(struct sas_rphy *rphy, u64 *identifier)
 {
        struct MPT2SAS_ADAPTER *ioc = rphy_to_ioc(rphy);
-       struct _sas_node *sas_expander;
+       struct _sas_device *sas_device;
        unsigned long flags;
 
-       spin_lock_irqsave(&ioc->sas_node_lock, flags);
-       sas_expander = mpt2sas_scsih_expander_find_by_sas_address(ioc,
+       spin_lock_irqsave(&ioc->sas_device_lock, flags);
+       sas_device = mpt2sas_scsih_sas_device_find_by_sas_address(ioc,
            rphy->identify.sas_address);
-       spin_unlock_irqrestore(&ioc->sas_node_lock, flags);
+       spin_unlock_irqrestore(&ioc->sas_device_lock, flags);
 
-       if (!sas_expander)
+       if (!sas_device)
                return -ENXIO;
 
-       *identifier = sas_expander->enclosure_logical_id;
+       *identifier = sas_device->enclosure_logical_id;
        return 0;
 }