Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 33 insertions, 30 deletions

diff --git a/drivers/ieee1394/nodemgr.c b/drivers/ieee1394/nodemgr.c
index 994a21e5a0aa..16240a789650 100644
--- a/drivers/ieee1394/nodemgr.c
+++ b/drivers/ieee1394/nodemgr.c
@@ -844,7 +844,7 @@ static struct node_entry *nodemgr_create_node(octlet_t guid, struct csr1212_csr
         ne->host = host;
         ne->nodeid = nodeid;
         ne->generation = generation;
-        ne->needs_probe = 1;
+        ne->needs_probe = true;
 
         ne->guid = guid;
         ne->guid_vendor_id = (guid >> 40) & 0xffffff;
@@ -1144,7 +1144,7 @@ static void nodemgr_process_root_directory(struct host_info *hi, struct node_ent
         struct csr1212_keyval *kv, *vendor_name_kv = NULL;
         u8 last_key_id = 0;
 
-        ne->needs_probe = 0;
+        ne->needs_probe = false;
 
         csr1212_for_each_dir_entry(ne->csr, kv, ne->csr->root_kv, dentry) {
                 switch (kv->key.id) {
@@ -1295,7 +1295,7 @@ static void nodemgr_update_node(struct node_entry *ne, struct csr1212_csr *csr,
                 nodemgr_update_bus_options(ne);
 
                 /* Mark the node as new, so it gets re-probed */
-                ne->needs_probe = 1;
+                ne->needs_probe = true;
         } else {
                 /* old cache is valid, so update its generation */
                 struct nodemgr_csr_info *ci = ne->csr->private;
@@ -1566,57 +1566,60 @@ static void nodemgr_probe_ne(struct host_info *hi, struct node_entry *ne, int ge
 struct probe_param {
         struct host_info *hi;
         int generation;
+        bool probe_now;
 };
 
-static int __nodemgr_node_probe(struct device *dev, void *data)
+static int node_probe(struct device *dev, void *data)
 {
-        struct probe_param *param = (struct probe_param *)data;
+        struct probe_param *p = data;
         struct node_entry *ne;
 
+        if (p->generation != get_hpsb_generation(p->hi->host))
+                return -EAGAIN;
+
         ne = container_of(dev, struct node_entry, node_dev);
-        if (!ne->needs_probe)
-                nodemgr_probe_ne(param->hi, ne, param->generation);
-        if (ne->needs_probe)
-                nodemgr_probe_ne(param->hi, ne, param->generation);
+        if (ne->needs_probe == p->probe_now)
+                nodemgr_probe_ne(p->hi, ne, p->generation);
         return 0;
 }
 
 static void nodemgr_node_probe(struct host_info *hi, int generation)
 {
-        struct hpsb_host *host = hi->host;
-        struct probe_param param;
+        struct probe_param p;
 
-        param.hi = hi;
-        param.generation = generation;
-        /* Do some processing of the nodes we've probed. This pulls them
+        p.hi = hi;
+        p.generation = generation;
+        /*
+         * Do some processing of the nodes we've probed. This pulls them
          * into the sysfs layer if needed, and can result in processing of
          * unit-directories, or just updating the node and it's
          * unit-directories.
          *
          * Run updates before probes. Usually, updates are time-critical
-         * while probes are time-consuming. (Well, those probes need some
-         * improvement...) */
-
-        class_for_each_device(&nodemgr_ne_class, NULL, &param,
-                              __nodemgr_node_probe);
-
-        /* If we had a bus reset while we were scanning the bus, it is
-         * possible that we did not probe all nodes.  In that case, we
-         * skip the clean up for now, since we could remove nodes that
-         * were still on the bus.  Another bus scan is pending which will
-         * do the clean up eventually.
+         * while probes are time-consuming.
          *
+         * Meanwhile, another bus reset may have happened. In this case we
+         * skip everything here and let the next bus scan handle it.
+         * Otherwise we may prematurely remove nodes which are still there.
+         */
+        p.probe_now = false;
+        if (class_for_each_device(&nodemgr_ne_class, NULL, &p, node_probe) != 0)
+                return;
+
+        p.probe_now = true;
+        if (class_for_each_device(&nodemgr_ne_class, NULL, &p, node_probe) != 0)
+                return;
+        /*
          * Now let's tell the bus to rescan our devices. This may seem
          * like overhead, but the driver-model core will only scan a
          * device for a driver when either the device is added, or when a
          * new driver is added. A bus reset is a good reason to rescan
          * devices that were there before.  For example, an sbp2 device
          * may become available for login, if the host that held it was
-         * just removed.  */
-
-        if (generation == get_hpsb_generation(host))
-                if (bus_rescan_devices(&ieee1394_bus_type))
-                        HPSB_DEBUG("bus_rescan_devices had an error");
+         * just removed.
+         */
+        if (bus_rescan_devices(&ieee1394_bus_type) != 0)
+                HPSB_DEBUG("bus_rescan_devices had an error");
 }
 
 static int nodemgr_send_resume_packet(struct hpsb_host *host)