Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (209 commits)
  [SCSI] fix oops during scsi scanning
  [SCSI] libsrp: fix memory leak in srp_ring_free()
  [SCSI] libiscsi, bnx2i: make bound ep check common
  [SCSI] libiscsi: add completion function for drivers that do not need pdu processing
  [SCSI] scsi_dh_rdac: changes for rdac debug logging
  [SCSI] scsi_dh_rdac: changes to collect the rdac debug information during the initialization
  [SCSI] scsi_dh_rdac: move the init code from rdac_activate to rdac_bus_attach
  [SCSI] sg: fix oops in the error path in sg_build_indirect()
  [SCSI] mptsas : Bump version to 3.04.12
  [SCSI] mptsas : FW event thread and scsi mid layer deadlock in SYNCHRONIZE CACHE command
  [SCSI] mptsas : Send DID_NO_CONNECT for pending IOs of removed device
  [SCSI] mptsas : PAE Kernel more than 4 GB kernel panic
  [SCSI] mptsas : NULL pointer on big endian systems causing Expander not to tear off
  [SCSI] mptsas : Sanity check for phyinfo is added
  [SCSI] scsi_dh_rdac: Add support for Sun StorageTek ST2500, ST2510 and ST2530
  [SCSI] pmcraid: PMC-Sierra MaxRAID driver to support 6Gb/s SAS RAID controller
  [SCSI] qla2xxx: Update version number to 8.03.01-k6.
  [SCSI] qla2xxx: Properly delete rports attached to a vport.
  [SCSI] qla2xxx: Correct various NPIV issues.
  [SCSI] qla2xxx: Correct qla2x00_eh_wait_on_command() to wait correctly.
  ...

1 files changed, 49 insertions, 20 deletions

diff --git a/drivers/misc/enclosure.c b/drivers/misc/enclosure.c
index 348443bdb23b..7b039306037f 100644
--- a/drivers/misc/enclosure.c
+++ b/drivers/misc/enclosure.c
@@ -33,24 +33,44 @@ static DEFINE_MUTEX(container_list_lock);
 static struct class enclosure_class;
 
 /**
- * enclosure_find - find an enclosure given a device
- * @dev:        the device to find for
+ * enclosure_find - find an enclosure given a parent device
+ * @dev:        the parent to match against
+ * @start:      Optional enclosure device to start from (NULL if none)
  *
- * Looks through the list of registered enclosures to see
- * if it can find a match for a device.  Returns NULL if no
- * enclosure is found. Obtains a reference to the enclosure class
- * device which must be released with device_put().
+ * Looks through the list of registered enclosures to find all those
+ * with @dev as a parent.  Returns NULL if no enclosure is
+ * found. @start can be used as a starting point to obtain multiple
+ * enclosures per parent (should begin with NULL and then be set to
+ * each returned enclosure device). Obtains a reference to the
+ * enclosure class device which must be released with device_put().
+ * If @start is not NULL, a reference must be taken on it which is
+ * released before returning (this allows a loop through all
+ * enclosures to exit with only the reference on the enclosure of
+ * interest held).  Note that the @dev may correspond to the actual
+ * device housing the enclosure, in which case no iteration via @start
+ * is required.
  */
-struct enclosure_device *enclosure_find(struct device *dev)
+struct enclosure_device *enclosure_find(struct device *dev,
+                                        struct enclosure_device *start)
 {
         struct enclosure_device *edev;
 
         mutex_lock(&container_list_lock);
-        list_for_each_entry(edev, &container_list, node) {
-                if (edev->edev.parent == dev) {
-                        get_device(&edev->edev);
-                        mutex_unlock(&container_list_lock);
-                        return edev;
+        edev = list_prepare_entry(start, &container_list, node);
+        if (start)
+                put_device(&start->edev);
+
+        list_for_each_entry_continue(edev, &container_list, node) {
+                struct device *parent = edev->edev.parent;
+                /* parent might not be immediate, so iterate up to
+                 * the root of the tree if necessary */
+                while (parent) {
+                        if (parent == dev) {
+                                get_device(&edev->edev);
+                                mutex_unlock(&container_list_lock);
+                                return edev;
+                        }
+                        parent = parent->parent;
                 }
         }
         mutex_unlock(&container_list_lock);
@@ -295,6 +315,9 @@ int enclosure_add_device(struct enclosure_device *edev, int component,
 
         cdev = &edev->component[component];
 
+        if (cdev->dev == dev)
+                return -EEXIST;
+
         if (cdev->dev)
                 enclosure_remove_links(cdev);
 
@@ -312,19 +335,25 @@ EXPORT_SYMBOL_GPL(enclosure_add_device);
  * Returns zero on success or an error.
  *
  */
-int enclosure_remove_device(struct enclosure_device *edev, int component)
+int enclosure_remove_device(struct enclosure_device *edev, struct device *dev)
 {
         struct enclosure_component *cdev;
+        int i;
 
-        if (!edev || component >= edev->components)
+        if (!edev || !dev)
                 return -EINVAL;
 
-        cdev = &edev->component[component];
-
-        device_del(&cdev->cdev);
-        put_device(cdev->dev);
-        cdev->dev = NULL;
-        return device_add(&cdev->cdev);
+        for (i = 0; i < edev->components; i++) {
+                cdev = &edev->component[i];
+                if (cdev->dev == dev) {
+                        enclosure_remove_links(cdev);
+                        device_del(&cdev->cdev);
+                        put_device(dev);
+                        cdev->dev = NULL;
+                        return device_add(&cdev->cdev);
+                }
+        }
+        return -ENODEV;
 }
 EXPORT_SYMBOL_GPL(enclosure_remove_device);