[SCSI] scsi_dh_rdac: move the init code from rdac_activate to rdac_bus_attach

Moving the initialization code from rdac_activate to rdac_bus_attach which is
more efficient.  We don't have to collect all the information during every
activate.

Signed-off-by: Babu Moger <babu.moger@lsi.com>
Reviewed-by: Vijay Chauhan <vijay.chauhan@lsi.com>
Reviewed-by: Bob Stankey <Robert.stankey@lsi.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>

1 files changed, 13 insertions, 13 deletions

diff --git a/drivers/scsi/device_handler/scsi_dh_rdac.c b/drivers/scsi/device_handler/scsi_dh_rdac.c
index 8b9e14318d1b..c5e4476e912b 100644
--- a/drivers/scsi/device_handler/scsi_dh_rdac.c
+++ b/drivers/scsi/device_handler/scsi_dh_rdac.c
@@ -525,17 +525,6 @@ static int rdac_activate(struct scsi_device *sdev)
         if (err != SCSI_DH_OK)
                 goto done;
 
-        if (!h->ctlr) {
-                err = initialize_controller(sdev, h);
-                if (err != SCSI_DH_OK)
-                        goto done;
-        }
-
-        if (h->ctlr->use_ms10 == -1) {
-                err = set_mode_select(sdev, h);
-                if (err != SCSI_DH_OK)
-                        goto done;
-        }
         if (h->lun_state == RDAC_LUN_UNOWNED)
                 err = send_mode_select(sdev, h);
 done:
@@ -681,12 +670,20 @@ static int rdac_bus_attach(struct scsi_device *sdev)
         if (err != SCSI_DH_OK)
                 goto failed;
 
-        err = check_ownership(sdev, h);
+        err = initialize_controller(sdev, h);
         if (err != SCSI_DH_OK)
                 goto failed;
 
+        err = check_ownership(sdev, h);
+        if (err != SCSI_DH_OK)
+                goto clean_ctlr;
+
+        err = set_mode_select(sdev, h);
+        if (err != SCSI_DH_OK)
+                goto clean_ctlr;
+
         if (!try_module_get(THIS_MODULE))
-                goto failed;
+                goto clean_ctlr;
 
         spin_lock_irqsave(sdev->request_queue->queue_lock, flags);
         sdev->scsi_dh_data = scsi_dh_data;
@@ -698,6 +695,9 @@ static int rdac_bus_attach(struct scsi_device *sdev)
 
         return 0;
 
+clean_ctlr:
+        kref_put(&h->ctlr->kref, release_controller);
+
 failed:
         kfree(scsi_dh_data);
         sdev_printk(KERN_ERR, sdev, "%s: not attached\n",