[SCSI] sym2: Manage sym_lcb properly

Allocate the lcb in slave_alloc and free it in slave_destroy.  This allows
us to remove all the code that checks to see if it's already been allocated.

From: Christoph Hellwig <hch@lst.de>
Signed-off-by: Matthew Wilcox <matthew@wil.cx>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

1 files changed, 31 insertions, 28 deletions

diff --git a/drivers/scsi/sym53c8xx_2/sym_glue.c b/drivers/scsi/sym53c8xx_2/sym_glue.c
index 7fc0b97173e1..a2bfdf8417a2 100644
--- a/drivers/scsi/sym53c8xx_2/sym_glue.c
+++ b/drivers/scsi/sym53c8xx_2/sym_glue.c
@@ -563,10 +563,7 @@ int sym_setup_data_and_start(struct sym_hcb *np, struct scsi_cmnd *cmd, struct s
         /*
          *      activate this job.
          */
-        if (lp)
-                sym_start_next_ccbs(np, lp, 2);
-        else
-                sym_put_start_queue(np, cp);
+        sym_start_next_ccbs(np, lp, 2);
         return 0;
 
 out_abort:
@@ -981,15 +978,13 @@ static int device_queue_depth(struct sym_hcb *np, int target, int lun)
 
 static int sym53c8xx_slave_alloc(struct scsi_device *sdev)
 {
-        struct sym_hcb *np;
-        struct sym_tcb *tp;
+        struct sym_hcb *np = sym_get_hcb(sdev->host);
+        struct sym_tcb *tp = &np->target[sdev->id];
+        struct sym_lcb *lp;
 
         if (sdev->id >= SYM_CONF_MAX_TARGET || sdev->lun >= SYM_CONF_MAX_LUN)
                 return -ENXIO;
 
-        np = sym_get_hcb(sdev->host);
-        tp = &np->target[sdev->id];
-
         /*
          * Fail the device init if the device is flagged NOSCAN at BOOT in
          * the NVRAM.  This may speed up boot and maintain coherency with
@@ -1005,6 +1000,10 @@ static int sym53c8xx_slave_alloc(struct scsi_device *sdev)
                 return -ENXIO;
         }
 
+        lp = sym_alloc_lcb(np, sdev->id, sdev->lun);
+        if (!lp)
+                return -ENOMEM;
+
         tp->starget = sdev->sdev_target;
         return 0;
 }
@@ -1012,22 +1011,14 @@ static int sym53c8xx_slave_alloc(struct scsi_device *sdev)
 /*
  * Linux entry point for device queue sizing.
  */
-static int sym53c8xx_slave_configure(struct scsi_device *device)
+static int sym53c8xx_slave_configure(struct scsi_device *sdev)
 {
-        struct sym_hcb *np = sym_get_hcb(device->host);
-        struct sym_tcb *tp = &np->target[device->id];
-        struct sym_lcb *lp;
+        struct sym_hcb *np = sym_get_hcb(sdev->host);
+        struct sym_tcb *tp = &np->target[sdev->id];
+        struct sym_lcb *lp = sym_lp(tp, sdev->lun);
         int reqtags, depth_to_use;
 
         /*
-         *  Allocate the LCB if not yet.
-         *  If it fail, we may well be in the sh*t. :)
-         */
-        lp = sym_alloc_lcb(np, device->id, device->lun);
-        if (!lp)
-                return -ENOMEM;
-
-        /*
          *  Get user flags.
          */
         lp->curr_flags = lp->user_flags;
@@ -1038,10 +1029,10 @@ static int sym53c8xx_slave_configure(struct scsi_device *device)
          *  Use at least 2.
          *  Donnot use more than our maximum.
          */
-        reqtags = device_queue_depth(np, device->id, device->lun);
+        reqtags = device_queue_depth(np, sdev->id, sdev->lun);
         if (reqtags > tp->usrtags)
                 reqtags = tp->usrtags;
-        if (!device->tagged_supported)
+        if (!sdev->tagged_supported)
                 reqtags = 0;
 #if 1 /* Avoid to locally queue commands for no good reasons */
         if (reqtags > SYM_CONF_MAX_TAG)
@@ -1050,19 +1041,30 @@ static int sym53c8xx_slave_configure(struct scsi_device *device)
 #else
         depth_to_use = (reqtags ? SYM_CONF_MAX_TAG : 2);
 #endif
-        scsi_adjust_queue_depth(device,
-                                (device->tagged_supported ?
+        scsi_adjust_queue_depth(sdev,
+                                (sdev->tagged_supported ?
                                  MSG_SIMPLE_TAG : 0),
                                 depth_to_use);
         lp->s.scdev_depth = depth_to_use;
-        sym_tune_dev_queuing(tp, device->lun, reqtags);
+        sym_tune_dev_queuing(tp, sdev->lun, reqtags);
 
-        if (!spi_initial_dv(device->sdev_target))
-                spi_dv_device(device);
+        if (!spi_initial_dv(sdev->sdev_target))
+                spi_dv_device(sdev);
 
         return 0;
 }
 
+static void sym53c8xx_slave_destroy(struct scsi_device *sdev)
+{
+        struct sym_hcb *np = sym_get_hcb(sdev->host);
+        struct sym_lcb *lp = sym_lp(&np->target[sdev->id], sdev->lun);
+
+        if (lp->itlq_tbl)
+                sym_mfree_dma(lp->itlq_tbl, SYM_CONF_MAX_TASK * 4, "ITLQ_TBL");
+        kfree(lp->cb_tags);
+        sym_mfree_dma(lp, sizeof(*lp), "LCB");
+}
+
 /*
  *  Linux entry point for info() function
  */
@@ -1926,6 +1928,7 @@ static struct scsi_host_template sym2_template = {
         .queuecommand           = sym53c8xx_queue_command,
         .slave_alloc            = sym53c8xx_slave_alloc,
         .slave_configure        = sym53c8xx_slave_configure,
+        .slave_destroy          = sym53c8xx_slave_destroy,
         .eh_abort_handler       = sym53c8xx_eh_abort_handler,
         .eh_device_reset_handler = sym53c8xx_eh_device_reset_handler,
         .eh_bus_reset_handler   = sym53c8xx_eh_bus_reset_handler,