| Message ID | E463DF2B2E584B4A82673F53D62C2EF474CCD1BA@cosmail01.lsi.com (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Headers | show |
Acked-by: Chandra Seetharaman <sekharan@us.ibm.com> On Thu, 2009-09-03 at 21:42 -0600, Moger, Babu wrote: > 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> > > --- > --- linux-2.6.31-rc5/drivers/scsi/device_handler/scsi_dh_rdac.c.orig 2009-09-03 13:39:52.000000000 -0500 > +++ linux-2.6.31-rc5/drivers/scsi/device_handler/scsi_dh_rdac.c 2009-09-03 14:10:40.000000000 -0500 > @@ -525,17 +525,6 @@ static int rdac_activate(struct scsi_dev > 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: > @@ -674,12 +663,20 @@ static int rdac_bus_attach(struct scsi_d > 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; > @@ -691,6 +688,9 @@ static int rdac_bus_attach(struct scsi_d > > 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", > > -- dm-devel mailing list dm-devel@redhat.com https://www.redhat.com/mailman/listinfo/dm-devel
--- linux-2.6.31-rc5/drivers/scsi/device_handler/scsi_dh_rdac.c.orig 2009-09-03 13:39:52.000000000 -0500 +++ linux-2.6.31-rc5/drivers/scsi/device_handler/scsi_dh_rdac.c 2009-09-03 14:10:40.000000000 -0500 @@ -525,17 +525,6 @@ static int rdac_activate(struct scsi_dev 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: @@ -674,12 +663,20 @@ static int rdac_bus_attach(struct scsi_d 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; @@ -691,6 +688,9 @@ static int rdac_bus_attach(struct scsi_d 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",