1 files changed, 50 insertions, 47 deletions

diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
index c44783801402..087821fac8fe 100644
--- a/drivers/scsi/scsi_scan.c
+++ b/drivers/scsi/scsi_scan.c
@@ -33,6 +33,7 @@
 #include <linux/kthread.h>
 #include <linux/spinlock.h>
 #include <linux/async.h>
+#include <linux/slab.h>
 
 #include <scsi/scsi.h>
 #include <scsi/scsi_cmnd.h>
@@ -251,6 +252,7 @@ static struct scsi_device *scsi_alloc_sdev(struct scsi_target *starget,
         sdev->model = scsi_null_device_strs;
         sdev->rev = scsi_null_device_strs;
         sdev->host = shost;
+        sdev->queue_ramp_up_period = SCSI_DEFAULT_RAMP_UP_PERIOD;
         sdev->id = starget->id;
         sdev->lun = lun;
         sdev->channel = starget->channel;
@@ -317,6 +319,7 @@ static struct scsi_device *scsi_alloc_sdev(struct scsi_target *starget,
 out_device_destroy:
         scsi_device_set_state(sdev, SDEV_DEL);
         transport_destroy_device(&sdev->sdev_gendev);
+        put_device(&sdev->sdev_dev);
         put_device(&sdev->sdev_gendev);
 out:
         if (display_failure_msg)
@@ -414,9 +417,7 @@ static struct scsi_target *scsi_alloc_target(struct device *parent,
         starget->reap_ref = 1;
         dev->parent = get_device(parent);
         dev_set_name(dev, "target%d:%d:%d", shost->host_no, channel, id);
-#ifndef CONFIG_SYSFS_DEPRECATED
         dev->bus = &scsi_bus_type;
-#endif
         dev->type = &scsi_target_type;
         starget->id = id;
         starget->channel = channel;
@@ -456,8 +457,7 @@ static struct scsi_target *scsi_alloc_target(struct device *parent,
         found_target->reap_ref++;
         spin_unlock_irqrestore(shost->host_lock, flags);
         if (found_target->state != STARGET_DEL) {
-                put_device(parent);
-                kfree(starget);
+                put_device(dev);
                 return found_target;
         }
         /* Unfortunately, we found a dying target; need to
@@ -490,19 +490,20 @@ void scsi_target_reap(struct scsi_target *starget)
         struct Scsi_Host *shost = dev_to_shost(starget->dev.parent);
         unsigned long flags;
         enum scsi_target_state state;
-        int empty;
+        int empty = 0;
 
         spin_lock_irqsave(shost->host_lock, flags);
         state = starget->state;
-        empty = --starget->reap_ref == 0 &&
-                list_empty(&starget->devices) ? 1 : 0;
+        if (--starget->reap_ref == 0 && list_empty(&starget->devices)) {
+                empty = 1;
+                starget->state = STARGET_DEL;
+        }
         spin_unlock_irqrestore(shost->host_lock, flags);
 
         if (!empty)
                 return;
 
         BUG_ON(state == STARGET_DEL);
-        starget->state = STARGET_DEL;
         if (state == STARGET_CREATED)
                 scsi_target_destroy(starget);
         else
@@ -877,7 +878,7 @@ static int scsi_add_lun(struct scsi_device *sdev, unsigned char *inq_result,
          * broken RA4x00 Compaq Disk Array
          */
         if (*bflags & BLIST_MAX_512)
-                blk_queue_max_sectors(sdev->request_queue, 512);
+                blk_queue_max_hw_sectors(sdev->request_queue, 512);
 
         /*
          * Some devices may not want to have a start command automatically
@@ -940,6 +941,8 @@ static int scsi_add_lun(struct scsi_device *sdev, unsigned char *inq_result,
                 }
         }
 
+        sdev->max_queue_depth = sdev->queue_depth;
+
         /*
          * Ok, the device is now all set up, we can
          * register it and tell the rest of the kernel
@@ -951,15 +954,6 @@ static int scsi_add_lun(struct scsi_device *sdev, unsigned char *inq_result,
         return SCSI_SCAN_LUN_PRESENT;
 }
 
-static inline void scsi_destroy_sdev(struct scsi_device *sdev)
-{
-        scsi_device_set_state(sdev, SDEV_DEL);
-        if (sdev->host->hostt->slave_destroy)
-                sdev->host->hostt->slave_destroy(sdev);
-        transport_destroy_device(&sdev->sdev_gendev);
-        put_device(&sdev->sdev_gendev);
-}
-
 #ifdef CONFIG_SCSI_LOGGING
 /** 
  * scsi_inq_str - print INQUIRY data from min to max index, strip trailing whitespace
@@ -1137,7 +1131,7 @@ static int scsi_probe_and_add_lun(struct scsi_target *starget,
                         }
                 }
         } else
-                scsi_destroy_sdev(sdev);
+                __scsi_remove_device(sdev);
  out:
         return res;
 }
@@ -1225,7 +1219,7 @@ static void scsi_sequential_lun_scan(struct scsi_target *starget,
 }
 
 /**
- * scsilun_to_int: convert a scsi_lun to an int
+ * scsilun_to_int - convert a scsi_lun to an int
  * @scsilun:    struct scsi_lun to be converted.
  *
  * Description:
@@ -1257,7 +1251,7 @@ int scsilun_to_int(struct scsi_lun *scsilun)
 EXPORT_SYMBOL(scsilun_to_int);
 
 /**
- * int_to_scsilun: reverts an int into a scsi_lun
+ * int_to_scsilun - reverts an int into a scsi_lun
  * @lun:        integer to be reverted
  * @scsilun:    struct scsi_lun to be set.
  *
@@ -1344,8 +1338,10 @@ static int scsi_report_lun_scan(struct scsi_target *starget, int bflags,
                 sdev = scsi_alloc_sdev(starget, 0, NULL);
                 if (!sdev)
                         return 0;
-                if (scsi_device_get(sdev))
+                if (scsi_device_get(sdev)) {
+                        __scsi_remove_device(sdev);
                         return 0;
+                }
         }
 
         sprintf(devname, "host %d channel %d id %d",
@@ -1498,7 +1494,7 @@ static int scsi_report_lun_scan(struct scsi_target *starget, int bflags,
                 /*
                  * the sdev we used didn't appear in the report luns scan
                  */
-                scsi_destroy_sdev(sdev);
+                __scsi_remove_device(sdev);
         return ret;
 }
 
@@ -1515,14 +1511,18 @@ struct scsi_device *__scsi_add_device(struct Scsi_Host *shost, uint channel,
         starget = scsi_alloc_target(parent, channel, id);
         if (!starget)
                 return ERR_PTR(-ENOMEM);
+        scsi_autopm_get_target(starget);
 
         mutex_lock(&shost->scan_mutex);
         if (!shost->async_scan)
                 scsi_complete_async_scans();
 
-        if (scsi_host_scan_allowed(shost))
+        if (scsi_host_scan_allowed(shost) && scsi_autopm_get_host(shost) == 0) {
                 scsi_probe_and_add_lun(starget, lun, NULL, &sdev, 1, hostdata);
+                scsi_autopm_put_host(shost);
+        }
         mutex_unlock(&shost->scan_mutex);
+        scsi_autopm_put_target(starget);
         scsi_target_reap(starget);
         put_device(&starget->dev);
 
@@ -1576,6 +1576,7 @@ static void __scsi_scan_target(struct device *parent, unsigned int channel,
         starget = scsi_alloc_target(parent, channel, id);
         if (!starget)
                 return;
+        scsi_autopm_get_target(starget);
 
         if (lun != SCAN_WILD_CARD) {
                 /*
@@ -1601,6 +1602,7 @@ static void __scsi_scan_target(struct device *parent, unsigned int channel,
         }
 
  out_reap:
+        scsi_autopm_put_target(starget);
         /* now determine if the target has any children at all
          * and if not, nuke it */
         scsi_target_reap(starget);
@@ -1635,8 +1637,10 @@ void scsi_scan_target(struct device *parent, unsigned int channel,
         if (!shost->async_scan)
                 scsi_complete_async_scans();
 
-        if (scsi_host_scan_allowed(shost))
+        if (scsi_host_scan_allowed(shost) && scsi_autopm_get_host(shost) == 0) {
                 __scsi_scan_target(parent, channel, id, lun, rescan);
+                scsi_autopm_put_host(shost);
+        }
         mutex_unlock(&shost->scan_mutex);
 }
 EXPORT_SYMBOL(scsi_scan_target);
@@ -1688,7 +1692,7 @@ int scsi_scan_host_selected(struct Scsi_Host *shost, unsigned int channel,
         if (!shost->async_scan)
                 scsi_complete_async_scans();
 
-        if (scsi_host_scan_allowed(shost)) {
+        if (scsi_host_scan_allowed(shost) && scsi_autopm_get_host(shost) == 0) {
                 if (channel == SCAN_WILD_CARD)
                         for (channel = 0; channel <= shost->max_channel;
                              channel++)
@@ -1696,6 +1700,7 @@ int scsi_scan_host_selected(struct Scsi_Host *shost, unsigned int channel,
                                                   rescan);
                 else
                         scsi_scan_channel(shost, channel, id, lun, rescan);
+                scsi_autopm_put_host(shost);
         }
         mutex_unlock(&shost->scan_mutex);
 
@@ -1708,7 +1713,7 @@ static void scsi_sysfs_add_devices(struct Scsi_Host *shost)
         shost_for_each_device(sdev, shost) {
                 if (!scsi_host_scan_allowed(shost) ||
                     scsi_sysfs_add_sdev(sdev) != 0)
-                        scsi_destroy_sdev(sdev);
+                        __scsi_remove_device(sdev);
         }
 }
 
@@ -1833,8 +1838,11 @@ static void do_scsi_scan_host(struct Scsi_Host *shost)
 static int do_scan_async(void *_data)
 {
         struct async_scan_data *data = _data;
-        do_scsi_scan_host(data->shost);
+        struct Scsi_Host *shost = data->shost;
+
+        do_scsi_scan_host(shost);
         scsi_finish_async_scan(data);
+        scsi_autopm_put_host(shost);
         return 0;
 }
 
@@ -1849,16 +1857,20 @@ void scsi_scan_host(struct Scsi_Host *shost)
 
         if (strncmp(scsi_scan_type, "none", 4) == 0)
                 return;
+        if (scsi_autopm_get_host(shost) < 0)
+                return;
 
         data = scsi_prep_async_scan(shost);
         if (!data) {
                 do_scsi_scan_host(shost);
+                scsi_autopm_put_host(shost);
                 return;
         }
 
         p = kthread_run(do_scan_async, data, "scsi_scan_%d", shost->host_no);
         if (IS_ERR(p))
                 do_scan_async(data);
+        /* scsi_autopm_put_host(shost) is called in do_scan_async() */
 }
 EXPORT_SYMBOL(scsi_scan_host);
 
@@ -1879,12 +1891,9 @@ void scsi_forget_host(struct Scsi_Host *shost)
         spin_unlock_irqrestore(shost->host_lock, flags);
 }
 
-/*
- * Function:    scsi_get_host_dev()
- *
- * Purpose:     Create a scsi_device that points to the host adapter itself.
- *
- * Arguments:   SHpnt   - Host that needs a scsi_device
+/**
+ * scsi_get_host_dev - Create a scsi_device that points to the host adapter itself
+ * @shost: Host that needs a scsi_device
  *
  * Lock status: None assumed.
  *
@@ -1897,7 +1906,7 @@ void scsi_forget_host(struct Scsi_Host *shost)
  *
  *      Note - this device is not accessible from any high-level
  *      drivers (including generics), which is probably not
- *      optimal.  We can add hooks later to attach 
+ *      optimal.  We can add hooks later to attach.
  */
 struct scsi_device *scsi_get_host_dev(struct Scsi_Host *shost)
 {
@@ -1912,10 +1921,9 @@ struct scsi_device *scsi_get_host_dev(struct Scsi_Host *shost)
                 goto out;
 
         sdev = scsi_alloc_sdev(starget, 0, NULL);
-        if (sdev) {
-                sdev->sdev_gendev.parent = get_device(&starget->dev);
+        if (sdev)
                 sdev->borken = 0;
-        } else
+        else
                 scsi_target_reap(starget);
         put_device(&starget->dev);
  out:
@@ -1924,24 +1932,19 @@ struct scsi_device *scsi_get_host_dev(struct Scsi_Host *shost)
 }
 EXPORT_SYMBOL(scsi_get_host_dev);
 
-/*
- * Function:    scsi_free_host_dev()
- *
- * Purpose:     Free a scsi_device that points to the host adapter itself.
- *
- * Arguments:   SHpnt   - Host that needs a scsi_device
+/**
+ * scsi_free_host_dev - Free a scsi_device that points to the host adapter itself
+ * @sdev: Host device to be freed
  *
  * Lock status: None assumed.
  *
  * Returns:     Nothing
- *
- * Notes:
  */
 void scsi_free_host_dev(struct scsi_device *sdev)
 {
         BUG_ON(sdev->id != sdev->host->this_id);
 
-        scsi_destroy_sdev(sdev);
+        __scsi_remove_device(sdev);
 }
 EXPORT_SYMBOL(scsi_free_host_dev);