1 files changed, 40 insertions, 16 deletions

diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
index dff8fafb741c..8d2312239ae0 100644
--- a/drivers/scsi/scsi_sysfs.c
+++ b/drivers/scsi/scsi_sysfs.c
@@ -775,6 +775,29 @@ static struct bin_attribute dev_attr_vpd_##_page = {		\
 sdev_vpd_pg_attr(pg83);
 sdev_vpd_pg_attr(pg80);
 
+static ssize_t show_inquiry(struct file *filep, struct kobject *kobj,
+                            struct bin_attribute *bin_attr,
+                            char *buf, loff_t off, size_t count)
+{
+        struct device *dev = container_of(kobj, struct device, kobj);
+        struct scsi_device *sdev = to_scsi_device(dev);
+
+        if (!sdev->inquiry)
+                return -EINVAL;
+
+        return memory_read_from_buffer(buf, count, &off, sdev->inquiry,
+                                       sdev->inquiry_len);
+}
+
+static struct bin_attribute dev_attr_inquiry = {
+        .attr = {
+                .name = "inquiry",
+                .mode = S_IRUGO,
+        },
+        .size = 0,
+        .read = show_inquiry,
+};
+
 static ssize_t
 show_iostat_counterbits(struct device *dev, struct device_attribute *attr,
                         char *buf)
@@ -900,7 +923,7 @@ sdev_store_queue_ramp_up_period(struct device *dev,
                 return -EINVAL;
 
         sdev->queue_ramp_up_period = msecs_to_jiffies(period);
-        return period;
+        return count;
 }
 
 static DEVICE_ATTR(queue_ramp_up_period, S_IRUGO | S_IWUSR,
@@ -959,6 +982,7 @@ static struct attribute *scsi_sdev_attrs[] = {
 static struct bin_attribute *scsi_sdev_bin_attrs[] = {
         &dev_attr_vpd_pg83,
         &dev_attr_vpd_pg80,
+        &dev_attr_inquiry,
         NULL
 };
 static struct attribute_group scsi_sdev_attr_group = {
@@ -1086,9 +1110,7 @@ void __scsi_remove_device(struct scsi_device *sdev)
                 device_unregister(&sdev->sdev_dev);
                 transport_remove_device(dev);
                 scsi_dh_remove_device(sdev);
-                device_del(dev);
-        } else
-                put_device(&sdev->sdev_dev);
+        }
 
         /*
          * Stop accepting new requests and wait until all queuecommand() and
@@ -1099,6 +1121,16 @@ void __scsi_remove_device(struct scsi_device *sdev)
         blk_cleanup_queue(sdev->request_queue);
         cancel_work_sync(&sdev->requeue_work);
 
+        /*
+         * Remove the device after blk_cleanup_queue() has been called such
+         * a possible bdi_register() call with the same name occurs after
+         * blk_cleanup_queue() has called bdi_destroy().
+         */
+        if (sdev->is_visible)
+                device_del(dev);
+        else
+                put_device(&sdev->sdev_dev);
+
         if (sdev->host->hostt->slave_destroy)
                 sdev->host->hostt->slave_destroy(sdev);
         transport_destroy_device(dev);
@@ -1160,31 +1192,23 @@ static void __scsi_remove_target(struct scsi_target *starget)
 void scsi_remove_target(struct device *dev)
 {
         struct Scsi_Host *shost = dev_to_shost(dev->parent);
-        struct scsi_target *starget, *last = NULL;
+        struct scsi_target *starget;
         unsigned long flags;
 
-        /* remove targets being careful to lookup next entry before
-         * deleting the last
-         */
+restart:
         spin_lock_irqsave(shost->host_lock, flags);
         list_for_each_entry(starget, &shost->__targets, siblings) {
                 if (starget->state == STARGET_DEL)
                         continue;
                 if (starget->dev.parent == dev || &starget->dev == dev) {
-                        /* assuming new targets arrive at the end */
                         kref_get(&starget->reap_ref);
                         spin_unlock_irqrestore(shost->host_lock, flags);
-                        if (last)
-                                scsi_target_reap(last);
-                        last = starget;
                         __scsi_remove_target(starget);
-                        spin_lock_irqsave(shost->host_lock, flags);
+                        scsi_target_reap(starget);
+                        goto restart;
                 }
         }
         spin_unlock_irqrestore(shost->host_lock, flags);
-
-        if (last)
-                scsi_target_reap(last);
 }
 EXPORT_SYMBOL(scsi_remove_target);