Re: (driver model) bus kset list manipulation bug

[Hollis Blanchard <hollisb@us.ibm.com>]

Hollis Blanchard wrote:

> Hi Patrick, I know you've passed maintainership of the driver model code 
> on, but I was hoping I could jog your memory.

Sorry, found the Mozilla "do not wrap" option now.

===== drivers/base/bus.c 1.52 vs edited =====
--- 1.52/drivers/base/bus.c     Tue Sep 30 10:59:35 2003
+++ edited/drivers/base/bus.c   Thu Jan 22 11:22:15 2004
@@ -8,7 +8,7 @@
  *
  */
 
-#undef DEBUG
+#define DEBUG
 
 #include <linux/device.h>
 #include <linux/module.h>
@@ -18,7 +18,7 @@
 #include "base.h"
 #include "power/power.h"
 
-#define to_dev(node) container_of(node,struct device,bus_list)
+#define to_dev(node) container_of(node,struct device,kobj.entry)
 #define to_drv(node) container_of(node,struct device_driver,kobj.entry)
 
 #define to_bus_attr(_attr) container_of(_attr,struct bus_attribute,attr)
@@ -164,7 +164,7 @@
        if (!(bus = get_bus(bus)))
                return -EINVAL;
 
-       head = start ? &start->bus_list : &bus->devices.list;
+       head = start ? &start->kobj.entry : &bus->devices.list;
 
        down_read(&bus->subsys.rwsem);
        list_for_each(entry,head) {
@@ -337,7 +337,7 @@
                return;
 
        list_for_each(entry,&bus->devices.list) {
-               struct device * dev = container_of(entry,struct device,bus_list);
+               struct device * dev = to_dev(entry);
                if (!dev->driver) {
                        error = bus_match(dev,drv);
                        if (error && (error != -ENODEV))
@@ -405,7 +405,7 @@
        if (bus) {
                down_write(&dev->bus->subsys.rwsem);
                pr_debug("bus %s: add device %s\n",bus->name,dev->bus_id);
-               list_add_tail(&dev->bus_list,&dev->bus->devices.list);
+               list_add_tail(&dev->kobj.entry,&dev->bus->devices.list);
                device_attach(dev);
                up_write(&dev->bus->subsys.rwsem);
                sysfs_create_link(&bus->devices.kobj,&dev->kobj,dev->bus_id);


-- 
Hollis Blanchard
IBM Linux Technology Center