scsi: aacraid: Merge func to get container information

BugLink: http://bugs.launchpad.net/bugs/1746801
Merge aac_get_containers to setup target function, so that information
about all the present devices can be retrieved in one shot.

Signed-off-by: Raghava Aditya Renukunta <RaghavaAditya.Renukunta@microsemi.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
(cherry picked from commit 1d1fec53dc13d56c80b02d391c7d593d9a502d6d)
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>

diff --git a/drivers/scsi/aacraid/aachba.c b/drivers/scsi/aacraid/aachba.c
index 67ca5af32e02415ae46bca46d242ccff766113ac..c30f7da1937f901a63d45cf97e514a10428303c9 100644 (file)
--- a/drivers/scsi/aacraid/aachba.c
+++ b/drivers/scsi/aacraid/aachba.c
@@ -2021,6 +2021,10 @@ static int aac_setup_safw_targets(struct aac_dev *dev, int rescan)
 {
        int rcode = 0;
 
+       rcode = aac_get_containers(dev);
+       if (unlikely(rcode < 0))
+               goto out;
+
        rcode = aac_get_safw_ciss_luns(dev, rescan);
        if (unlikely(rcode < 0))
                goto out;

diff --git a/drivers/scsi/aacraid/commsup.c b/drivers/scsi/aacraid/commsup.c
index 1ad34224511ad812e30b9dff2db5bb428a5700c3..0147c3accbfe2727bb7e4ff1664dec53a0aacb5e 100644 (file)
--- a/drivers/scsi/aacraid/commsup.c
+++ b/drivers/scsi/aacraid/commsup.c
@@ -1920,26 +1920,22 @@ static void aac_handle_sa_aif(struct aac_dev *dev, struct fib *fibptr)
 
                aac_resolve_luns(dev);
 
-               if (events == SA_AIF_LDEV_CHANGE ||
-                   events == SA_AIF_BPCFG_CHANGE) {
-                       aac_get_containers(dev);
-                       for (container = 0; container <
+               for (container = 0; container <
                        dev->maximum_num_containers; ++container) {
-                               sdev = scsi_device_lookup(dev->scsi_host_ptr,
-                                               CONTAINER_CHANNEL,
-                                               container, 0);
-                               if (dev->fsa_dev[container].valid && !sdev) {
-                                       scsi_add_device(dev->scsi_host_ptr,
-                                               CONTAINER_CHANNEL,
-                                               container, 0);
-                               } else if (!dev->fsa_dev[container].valid &&
-                                       sdev) {
-                                       scsi_remove_device(sdev);
-                                       scsi_device_put(sdev);
-                               } else if (sdev) {
-                                       scsi_rescan_device(&sdev->sdev_gendev);
-                                       scsi_device_put(sdev);
-                               }
+                       sdev = scsi_device_lookup(dev->scsi_host_ptr,
+                                       CONTAINER_CHANNEL,
+                                       container, 0);
+                       if (dev->fsa_dev[container].valid && !sdev) {
+                               scsi_add_device(dev->scsi_host_ptr,
+                                       CONTAINER_CHANNEL,
+                                       container, 0);
+                       } else if (!dev->fsa_dev[container].valid &&
+                               sdev) {
+                               scsi_remove_device(sdev);
+                               scsi_device_put(sdev);
+                       } else if (sdev) {
+                               scsi_rescan_device(&sdev->sdev_gendev);
+                               scsi_device_put(sdev);
                        }
                }
                break;