From: Kay Sievers <kay.sievers@vrfy.org>
Prefix platform modalias strings with "platform:", which

modprobe config to blacklist alias resolving if userspace

configures it.
Send uevents for all platform devices.
Add MODULE_ALIAS's to: pxa2xx_pcmcia, ds1742 and pcspkr to trigger

module autoloading by userspace.
  $ modinfo pcspkr

  alias:          platform:pcspkr

  license:        GPL

  description:    PC Speaker beeper driver

  ...
  $ modprobe -n -v platform:pcspkr

  insmod /lib/modules/2.6.23-rc3-g28e8351a-dirty/kernel/drivers/input/misc/pcspkr.ko
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>

Cc: David Brownell <david-b@pacbell.net>

Cc: Atsushi Nemoto <anemo@mba.ocn.ne.jp>

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---

 drivers/base/platform.c           |   15 ++-------------

 drivers/input/misc/pcspkr.c       |    1 +

 drivers/pcmcia/pxa2xx_mainstone.c |    2 +-

 drivers/pcmcia/pxa2xx_sharpsl.c   |    2 +-

 4 files changed, 5 insertions(+), 15 deletions(-)
diff --git a/drivers/base/platform.c b/drivers/base/platform.c

index 869ff8c..9bfc434 100644

--- a/drivers/base/platform.c

+++ b/drivers/base/platform.c

@@ -160,11 +160,6 @@ static void platform_device_release(struct device *dev)

  *

  *	Create a platform device object which can have other objects attached

  *	to it, and which will have attached objects freed when it is released.

- *

- *	This device will be marked as not supporting hotpluggable drivers; no

- *	device add/remove uevents will be generated.  In the unusual case that

- *	the device isn't being dynamically allocated as a legacy "probe the

- *	hardware" driver, infrastructure code should reverse this marking.

  */

 struct platform_device *platform_device_alloc(const char *name, unsigned int id)

 {

@@ -177,12 +172,6 @@ struct platform_device *platform_device_alloc(const char *name, unsigned int id)

 		pa->pdev.id = id;

 		device_initialize(&pa->pdev.dev);

 		pa->pdev.dev.release = platform_...
[ message continues ]

From: Tsugikazu Shibata <tshibata@ab.jp.nec.com>
Here is another sync patch of Documentation/ja_JP/HOWTO
Japanese developer sent me some cosmetic changes and also follow

changes of HOWTO

    Cross reference URL (sosdg.org/qiyong/lxr)

    known_regression explanations on kernel dev. process
Signed-off-by: Tsugikazu Shibata <tshibata@ab.jp.nec.com>

Cc: stable <stable@kernel.org>

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---

 Documentation/ja_JP/HOWTO |   84 ++++++++++++++++++++++++---------------------

 1 files changed, 45 insertions(+), 39 deletions(-)
diff --git a/Documentation/ja_JP/HOWTO b/Documentation/ja_JP/HOWTO

index 9f08dab..d9d832c 100644

--- a/Documentation/ja_JP/HOWTO

+++ b/Documentation/ja_JP/HOWTO

@@ -1,4 +1,4 @@

-

From: Kay Sievers <kay.sievers@vrfy.org>
Attributes do not have an owner(module) anymore, so there is no need

to carry the attributes in every single bus instance.
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>

Acked-by: Tejun Heo <htejun@gmail.com>

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---

 drivers/base/bus.c     |   21 +++++++++------------

 include/linux/device.h |    2 --

 2 files changed, 9 insertions(+), 14 deletions(-)
diff --git a/drivers/base/bus.c b/drivers/base/bus.c

index 61c6752..ff850d1 100644

--- a/drivers/base/bus.c

+++ b/drivers/base/bus.c

@@ -568,32 +568,29 @@ static void remove_bind_files(struct device_driver *drv)

 	driver_remove_file(drv, &driver_attr_unbind);

 }
+static BUS_ATTR(drivers_probe, S_IWUSR, NULL, store_drivers_probe);

+static BUS_ATTR(drivers_autoprobe, S_IWUSR | S_IRUGO,

+		show_drivers_autoprobe, store_drivers_autoprobe);

+

 static int add_probe_files(struct bus_type *bus)

 {

 	int retval;
-	bus->drivers_probe_attr.attr.name = "drivers_probe";

-	bus->drivers_probe_attr.attr.mode = S_IWUSR;

-	bus->drivers_probe_attr.store = store_drivers_probe;

-	retval = bus_create_file(bus, &bus->drivers_probe_attr);

+	retval = bus_create_file(bus, &bus_attr_drivers_probe);

 	if (retval)

 		goto out;
-	bus->drivers_autoprobe_attr.attr.name = "drivers_autoprobe";

-	bus->drivers_autoprobe_attr.attr.mode = S_IWUSR | S_IRUGO;

-	bus->drivers_autoprobe_attr.show = show_drivers_autoprobe;

-	bus->drivers_autoprobe_attr.store = store_drivers_autoprobe;

-	retval = bus_create_file(bus, &bus->drivers_autoprobe_attr);

+	retval = bus_create_file(bus, &bus_attr_drivers_autoprobe);

 	if (retval)

-		bus_remove_file(bus, &bus->drivers_probe_attr);

+		bus_remove_file(bus, &bus_attr_drivers_probe);

 out:

 	return retval;

 }
 static void remove_probe_files(struct bus_type *bus)

 {

-	bus_remove_file(bus, &bus->drivers_autoprobe_attr);

-	bus_remove_f...
[ message continues ]

From: Kay Sievers <kay.sievers@vrfy.org>
This changes the uevent buffer functions to use a struct instead of a

long list of parameters. It does no longer require the caller to do the

proper buffer termination and size accounting, which is currently wrong

in some places. It fixes a known bug where parts of the uevent

environment are overwritten because of wrong index calculations.
Many thanks to Mathieu Desnoyers for finding bugs and improving the

error handling.
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>

Cc: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>

Cc: Cornelia Huck <cornelia.huck@de.ibm.com>

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---

 arch/ia64/sn/kernel/tiocx.c                 |    3 +-

 arch/powerpc/kernel/of_device.c             |   37 ++-----

 arch/powerpc/kernel/vio.c                   |   16 +---

 arch/powerpc/platforms/ps3/system-bus.c     |    9 +--

 block/genhd.c                               |   35 ++-----

 drivers/acpi/scan.c                         |   16 ++--

 drivers/amba/bus.c                          |    9 +-

 drivers/base/class.c                        |   42 ++------

 drivers/base/core.c                         |   84 +++++-----------

 drivers/base/firmware_class.c               |   11 +--

 drivers/base/memory.c                       |    3 +-

 drivers/base/platform.c                     |    6 +-

 drivers/eisa/eisa-bus.c                     |    9 +--

 drivers/firewire/fw-device.c                |   11 +--

 drivers/firmware/dmi-id.c                   |   17 ++--

 drivers/i2c/i2c-core.c                      |    8 +-

 drivers/ide/ide.c                           |   17 +--

 drivers/ieee1394/nodemgr.c                  |   17 +---

 drivers/infiniband/core/sysfs.c             |    9 +-

 drivers/input/input.c                       |   62 ++++--------

 drivers/input/serio/serio.c                 |   11 +--

 drivers/media/video/pvrusb2/pvrusb2-sysfs.c |    4 +-

 drivers/misc/tifm_core.c                  ...
[ message continues ]

From: Kay Sievers <kay.sievers@vrfy.org>
The kernel creates a process for every event that is send, even when

there is no binary it could execute.  We are needlessly creating around

200-300 failing processes during early bootup, until we have the chance

to disable it from userspace.
This change allows us to disable /sbin/hotplug entirely, if you want to,

by setting UEVENT_HELPER_PATH="" in the kernel config.
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---

 drivers/base/Kconfig |    8 ++++++++

 lib/kobject_uevent.c |    2 +-

 2 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/drivers/base/Kconfig b/drivers/base/Kconfig

index 5d6312e..d7da109 100644

--- a/drivers/base/Kconfig

+++ b/drivers/base/Kconfig

@@ -1,5 +1,13 @@

 menu "Generic Driver Options"
+config UEVENT_HELPER_PATH

+	string "path to uevent helper"

+	depends on HOTPLUG

+	default "/sbin/hotplug"

+	help

+	  Path to uevent helper program forked by the kernel for

+	  every uevent.

+

 config STANDALONE

 	bool "Select only drivers that don't need compile-time external firmware" if EXPERIMENTAL

 	default y

diff --git a/lib/kobject_uevent.c b/lib/kobject_uevent.c

index 7d8aeb3..5ccda46 100644

--- a/lib/kobject_uevent.c

+++ b/lib/kobject_uevent.c

@@ -35,7 +35,7 @@ const char *kobject_actions[] = {
 #if defined(CONFIG_HOTPLUG)

 u64 uevent_seqnum;

-char uevent_helper[UEVENT_HELPER_PATH_LEN] = "/sbin/hotplug";

+char uevent_helper[UEVENT_HELPER_PATH_LEN] = CONFIG_UEVENT_HELPER_PATH;

 static DEFINE_SPINLOCK(sequence_lock);

 #if defined(CONFIG_NET)

 static struct sock *uevent_sock;

--

1.5.3.4
-

This macro is only used by the driver core and is held over from when we

had subsystems.  It is not needed anymore.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---

 drivers/base/bus.c      |    3 ++-

 drivers/base/class.c    |    2 +-

 include/linux/kobject.h |   13 -------------

 3 files changed, 3 insertions(+), 15 deletions(-)
diff --git a/drivers/base/bus.c b/drivers/base/bus.c

index ff850d1..625f7e6 100644

--- a/drivers/base/bus.c

+++ b/drivers/base/bus.c

@@ -823,7 +823,8 @@ int bus_register(struct bus_type * bus)

 	if (retval)

 		goto out;
-	subsys_set_kset(bus, bus_subsys);

+	bus->subsys.kobj.kset = &bus_subsys;

+

 	retval = subsystem_register(&bus->subsys);

 	if (retval)

 		goto out;

diff --git a/drivers/base/class.c b/drivers/base/class.c

index ecd6336..cf9cf66 100644

--- a/drivers/base/class.c

+++ b/drivers/base/class.c

@@ -149,7 +149,7 @@ int class_register(struct class * cls)

 	if (error)

 		return error;
-	subsys_set_kset(cls, class_subsys);

+	cls->subsys.kobj.kset = &class_subsys;
 	error = subsystem_register(&cls->subsys);

 	if (!error) {

diff --git a/include/linux/kobject.h b/include/linux/kobject.h

index 626bdd3..0713799 100644

--- a/include/linux/kobject.h

+++ b/include/linux/kobject.h

@@ -241,19 +241,6 @@ extern struct kset hypervisor_subsys;

 #define kset_set_kset_s(obj,subsys) \

 	(obj)->kset.kobj.kset = &(subsys)
-/**

- *	subsys_set_kset(obj,subsys) - set kset for subsystem

- *	@obj:		ptr to some object type.

- *	@_subsys:	a subsystem object (not a ptr).

- *

- *	Can be used for any object type with an embedded ->subsys.

- *	Sets the kset of @obj's kobject to @subsys.kset. This makes

- *	the object a member of that kset.

- */

-

-#define subsys_set_kset(obj,_subsys) \

-	(obj)->subsys.kobj.kset = &(_subsys)

-

 extern void subsystem_init(struct kset *);

 extern int __must_check subsystem_register(struct kset *);

 extern void subsystem_unregister(struct kset *);

--

...
[ message continues ]

This macro is only used by the driver core and is held over from when we

had subsystems.  It is not needed anymore.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---

 drivers/base/sys.c      |    2 +-

 include/linux/kobject.h |   14 --------------

 2 files changed, 1 insertions(+), 15 deletions(-)
diff --git a/drivers/base/sys.c b/drivers/base/sys.c

index 18febe2..7ad8931 100644

--- a/drivers/base/sys.c

+++ b/drivers/base/sys.c

@@ -139,7 +139,7 @@ int sysdev_class_register(struct sysdev_class * cls)

 		 kobject_name(&cls->kset.kobj));

 	INIT_LIST_HEAD(&cls->drivers);

 	cls->kset.kobj.parent = &system_subsys.kobj;

-	kset_set_kset_s(cls, system_subsys);

+	cls->kset.kobj.kset = &system_subsys;

 	return kset_register(&cls->kset);

 }
diff --git a/include/linux/kobject.h b/include/linux/kobject.h

index 0713799..ee61ef2 100644

--- a/include/linux/kobject.h

+++ b/include/linux/kobject.h

@@ -227,20 +227,6 @@ extern struct kset hypervisor_subsys;

 #define kobj_set_kset_s(obj,subsys) \

 	(obj)->kobj.kset = &(subsys)
-/**

- *	kset_set_kset_s(obj,subsys) - set kset for embedded kset.

- *	@obj:		ptr to some object type.

- *	@subsys:	a subsystem object (not a ptr).

- *

- *	Can be used for any object type with an embedded ->kset.

- *	Sets the kset of @obj's  embedded kobject (via its embedded

- *	kset) to @subsys.kset. This makes @obj a member of that

- *	kset.

- */

-

-#define kset_set_kset_s(obj,subsys) \

-	(obj)->kset.kobj.kset = &(subsys)

-

 extern void subsystem_init(struct kset *);

 extern int __must_check subsystem_register(struct kset *);

 extern void subsystem_unregister(struct kset *);

--

1.5.3.4
-

There are no more subsystems, it's a kset now so remove the function and

the only two users, which are in the driver core.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---

 drivers/base/bus.c      |    2 +-

 drivers/base/class.c    |    2 +-

 include/linux/kobject.h |    5 -----

 lib/kobject.c           |    2 +-

 4 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/drivers/base/bus.c b/drivers/base/bus.c

index 625f7e6..2f77593 100644

--- a/drivers/base/bus.c

+++ b/drivers/base/bus.c

@@ -734,7 +734,7 @@ struct bus_type *get_bus(struct bus_type *bus)
 void put_bus(struct bus_type * bus)

 {

-	subsys_put(&bus->subsys);

+	kset_put(&bus->subsys);

 }
diff --git a/drivers/base/class.c b/drivers/base/class.c

index cf9cf66..50e3413 100644

--- a/drivers/base/class.c

+++ b/drivers/base/class.c

@@ -100,7 +100,7 @@ static struct class *class_get(struct class *cls)

 static void class_put(struct class * cls)

 {

 	if (cls)

-		subsys_put(&cls->subsys);

+		kset_put(&cls->subsys);

 }
diff --git a/include/linux/kobject.h b/include/linux/kobject.h

index ee61ef2..45effed 100644

--- a/include/linux/kobject.h

+++ b/include/linux/kobject.h

@@ -238,11 +238,6 @@ static inline struct kset *subsys_get(struct kset *s)

 	return NULL;

 }
-static inline void subsys_put(struct kset *s)

-{

-	kset_put(s);

-}

-

 struct subsys_attribute {

 	struct attribute attr;

 	ssize_t (*show)(struct kset *, char *);

diff --git a/lib/kobject.c b/lib/kobject.c

index 4b08e0f..0aa4e90 100644

--- a/lib/kobject.c

+++ b/lib/kobject.c

@@ -681,7 +681,7 @@ int subsys_create_file(struct kset *s, struct subsys_attribute *a)
 	if (subsys_get(s)) {

 		error = sysfs_create_file(&s->kobj, &a->attr);

-		subsys_put(s);

+		kset_put(s);

 	}

 	return error;

 }

--

1.5.3.4
-

There are no more subsystems, it's a kset now so remove the function and

the only two users, which are in the driver core.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---

 drivers/base/bus.c      |    2 +-

 drivers/base/class.c    |    2 +-

 include/linux/kobject.h |    7 -------

 lib/kobject.c           |    2 +-

 4 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/drivers/base/bus.c b/drivers/base/bus.c

index 2f77593..bc38085 100644

--- a/drivers/base/bus.c

+++ b/drivers/base/bus.c

@@ -728,7 +728,7 @@ EXPORT_SYMBOL_GPL(device_reprobe);
 struct bus_type *get_bus(struct bus_type *bus)

 {

-	return bus ? container_of(subsys_get(&bus->subsys),

+	return bus ? container_of(kset_get(&bus->subsys),

 				struct bus_type, subsys) : NULL;

 }
diff --git a/drivers/base/class.c b/drivers/base/class.c

index 50e3413..3e9b04c 100644

--- a/drivers/base/class.c

+++ b/drivers/base/class.c

@@ -93,7 +93,7 @@ void class_remove_file(struct class * cls, const struct class_attribute * attr)

 static struct class *class_get(struct class *cls)

 {

 	if (cls)

-		return container_of(subsys_get(&cls->subsys), struct class, subsys);

+		return container_of(kset_get(&cls->subsys), struct class, subsys);

 	return NULL;

 }
diff --git a/include/linux/kobject.h b/include/linux/kobject.h

index 45effed..c0fb535 100644

--- a/include/linux/kobject.h

+++ b/include/linux/kobject.h

@@ -231,13 +231,6 @@ extern void subsystem_init(struct kset *);

 extern int __must_check subsystem_register(struct kset *);

 extern void subsystem_unregister(struct kset *);
-static inline struct kset *subsys_get(struct kset *s)

-{

-	if (s)

-		return kset_get(s);

-	return NULL;

-}

-

 struct subsys_attribute {

 	struct attribute attr;

 	ssize_t (*show)(struct kset *, char *);

diff --git a/lib/kobject.c b/lib/kobject.c

index 0aa4e90..1326041 100644

--- a/lib/kobject.c

+++ b/lib/kobject.c

@@ -679,7 +679,7 @@ int subsys_create_file(struct kset *s, struct subsys_at...
[ message continues ]

put_bus() should not be globally visable as it is not used by anything

other than drivers/base/bus.c.  This patch removes the visability of it,

and renames it to match all of the other *_put() functions in the

kernel.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---

 drivers/base/base.h |    1 -

 drivers/base/bus.c  |   29 ++++++++++++++---------------

 2 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/drivers/base/base.h b/drivers/base/base.h

index 47eb02d..cebc7e7 100644

--- a/drivers/base/base.h

+++ b/drivers/base/base.h

@@ -19,7 +19,6 @@ extern int bus_add_device(struct device * dev);

 extern void bus_attach_device(struct device * dev);

 extern void bus_remove_device(struct device * dev);

 extern struct bus_type *get_bus(struct bus_type * bus);

-extern void put_bus(struct bus_type * bus);
 extern int bus_add_driver(struct device_driver *);

 extern void bus_remove_driver(struct device_driver *);

diff --git a/drivers/base/bus.c b/drivers/base/bus.c

index bc38085..4f53b75 100644

--- a/drivers/base/bus.c

+++ b/drivers/base/bus.c

@@ -30,6 +30,11 @@

 static int __must_check bus_rescan_devices_helper(struct device *dev,

 						void *data);
+static void bus_put(struct bus_type *bus)

+{

+	kset_put(&bus->subsys);

+}

+

 static ssize_t

 drv_attr_show(struct kobject * kobj, struct attribute * attr, char * buf)

 {

@@ -124,7 +129,7 @@ int bus_create_file(struct bus_type * bus, struct bus_attribute * attr)

 	int error;

 	if (get_bus(bus)) {

 		error = sysfs_create_file(&bus->subsys.kobj, &attr->attr);

-		put_bus(bus);

+		bus_put(bus);

 	} else

 		error = -EINVAL;

 	return error;

@@ -134,7 +139,7 @@ void bus_remove_file(struct bus_type * bus, struct bus_attribute * attr)

 {

 	if (get_bus(bus)) {

 		sysfs_remove_file(&bus->subsys.kobj, &attr->attr);

-		put_bus(bus);

+		bus_put(bus);

 	}

 }
@@ -186,7 +191,7 @@ static ssize_t driver_unbind(struct device_driver *drv,

 		err = count;

 	}

 	put_device(d...
[ message continues ]

get_bus() should not be globally visable as it is not used by anything

other than drivers/base/bus.c.  This patch removes the visability of it,

and renames it to match all of the other *_get() functions in the

kernel.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---

 drivers/base/base.h |    1 -

 drivers/base/bus.c  |   24 ++++++++++++------------

 2 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/drivers/base/base.h b/drivers/base/base.h

index cebc7e7..10b2fb6 100644

--- a/drivers/base/base.h

+++ b/drivers/base/base.h

@@ -18,7 +18,6 @@ extern int attribute_container_init(void);

 extern int bus_add_device(struct device * dev);

 extern void bus_attach_device(struct device * dev);

 extern void bus_remove_device(struct device * dev);

-extern struct bus_type *get_bus(struct bus_type * bus);
 extern int bus_add_driver(struct device_driver *);

 extern void bus_remove_driver(struct device_driver *);

diff --git a/drivers/base/bus.c b/drivers/base/bus.c

index 4f53b75..0a8d075 100644

--- a/drivers/base/bus.c

+++ b/drivers/base/bus.c

@@ -30,6 +30,12 @@

 static int __must_check bus_rescan_devices_helper(struct device *dev,

 						void *data);
+static struct bus_type *bus_get(struct bus_type *bus)

+{

+	return bus ? container_of(kset_get(&bus->subsys),

+				struct bus_type, subsys) : NULL;

+}

+

 static void bus_put(struct bus_type *bus)

 {

 	kset_put(&bus->subsys);

@@ -127,7 +133,7 @@ static struct sysfs_ops bus_sysfs_ops = {

 int bus_create_file(struct bus_type * bus, struct bus_attribute * attr)

 {

 	int error;

-	if (get_bus(bus)) {

+	if (bus_get(bus)) {

 		error = sysfs_create_file(&bus->subsys.kobj, &attr->attr);

 		bus_put(bus);

 	} else

@@ -137,7 +143,7 @@ int bus_create_file(struct bus_type * bus, struct bus_attribute * attr)
 void bus_remove_file(struct bus_type * bus, struct bus_attribute * attr)

 {

-	if (get_bus(bus)) {

+	if (bus_get(bus)) {

 		sysfs_remove_file(&bus->subsys.kobj, &attr-&g...
[ message continues ]

A number of different drivers incorrect access the kobject name field

directly.  This is not correct as the name might not be in the array.

Use the proper accessor function instead.

---

 block/elevator.c          |    2 +-

 block/ll_rw_blk.c         |    2 +-

 drivers/acpi/bus.c        |    2 +-

 drivers/cpufreq/cpufreq.c |    2 +-

 drivers/md/md.c           |    3 +--

 drivers/net/ibmveth.c     |    2 +-

 drivers/pci/setup-irq.c   |    2 +-

 fs/partitions/check.c     |   12 +++++++-----

 fs/sysfs/dir.c            |    2 +-

 net/bridge/br_sysfs_br.c  |    2 +-

 10 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/block/elevator.c b/block/elevator.c

index c6d153d..b9c518a 100644

--- a/block/elevator.c

+++ b/block/elevator.c

@@ -186,7 +186,7 @@ static elevator_t *elevator_alloc(struct request_queue *q,

 	eq->ops = &e->ops;

 	eq->elevator_type = e;

 	kobject_init(&eq->kobj);

-	snprintf(eq->kobj.name, KOBJ_NAME_LEN, "%s", "iosched");

+	kobject_set_name(&eq->kobj, "%s", "iosched");

 	eq->kobj.ktype = &elv_ktype;

 	mutex_init(&eq->sysfs_lock);
diff --git a/block/ll_rw_blk.c b/block/ll_rw_blk.c

index cd9d2c5..d875673 100644

--- a/block/ll_rw_blk.c

+++ b/block/ll_rw_blk.c

@@ -1854,7 +1854,7 @@ struct request_queue *blk_alloc_queue_node(gfp_t gfp_mask, int node_id)
 	init_timer(&q->unplug_timer);
-	snprintf(q->kobj.name, KOBJ_NAME_LEN, "%s", "queue");

+	kobject_set_name(&q->kobj, "%s", "queue");

 	q->kobj.ktype = &queue_ktype;

 	kobject_init(&q->kobj);
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c

index feab124..cbfc815 100644

--- a/drivers/acpi/bus.c

+++ b/drivers/acpi/bus.c

@@ -194,7 +194,7 @@ int acpi_bus_set_power(acpi_handle handle, int state)
 	if (!device->flags.power_manageable) {

 		ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Device `[%s]' is not power manageable\n",

-				device->dev.kobj.name));

+				kobject_name(&device->dev.kobj)));

 		return -ENODEV;

 ...
[ message continues ]

struct cdev does not need the kobject name to be set, as it is never

used.  This patch fixes up the few places it is set.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Acked-by: Mauro Carvalho Chehab <mchehab@infradead.org>

---

 block/bsg.c                         |    5 +----

 drivers/char/raw.c                  |    5 +----

 drivers/media/dvb/dvb-core/dvbdev.c |    5 +----

 drivers/usb/core/devio.c            |    6 ++----

 4 files changed, 5 insertions(+), 16 deletions(-)
diff --git a/block/bsg.c b/block/bsg.c

index ed26468..b8ddfc6 100644

--- a/block/bsg.c

+++ b/block/bsg.c

@@ -1010,10 +1010,7 @@ unlock:

 }

 EXPORT_SYMBOL_GPL(bsg_register_queue);
-static struct cdev bsg_cdev = {

-	.kobj   = {.name = "bsg", },

-	.owner  = THIS_MODULE,

-};

+static struct cdev bsg_cdev;
 static int __init bsg_init(void)

 {

diff --git a/drivers/char/raw.c b/drivers/char/raw.c

index 1f0d7c6..bbfa0e2 100644

--- a/drivers/char/raw.c

+++ b/drivers/char/raw.c

@@ -255,10 +255,7 @@ static const struct file_operations raw_ctl_fops = {

 	.owner	=	THIS_MODULE,

 };
-static struct cdev raw_cdev = {

-	.kobj	=	{.name = "raw", },

-	.owner	=	THIS_MODULE,

-};

+static struct cdev raw_cdev;
 static int __init raw_init(void)

 {

diff --git a/drivers/media/dvb/dvb-core/dvbdev.c b/drivers/media/dvb/dvb-core/dvbdev.c

index 56231d8..18738fa 100644

--- a/drivers/media/dvb/dvb-core/dvbdev.c

+++ b/drivers/media/dvb/dvb-core/dvbdev.c

@@ -103,10 +103,7 @@ static struct file_operations dvb_device_fops =

 	.open =		dvb_device_open,

 };
-static struct cdev dvb_device_cdev = {

-	.kobj   = {.name = "dvb", },

-	.owner  =       THIS_MODULE,

-};

+static struct cdev dvb_device_cdev;
 int dvb_generic_open(struct inode *inode, struct file *file)

 {

diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c

index 927a181..fe98796 100644

--- a/drivers/usb/core/devio.c

+++ b/drivers/usb/core/devio.c

@@ -1576,6 +1576,7 @@ static unsigned int usbdev_poll(struct file *file, ...
[ message continues ]

A kset should not have its name set directly, so dynamically set the

name at runtime.
This is needed to remove the static array in the kobject structure which

will be changed in a future patch.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---

 drivers/edac/edac_mc_sysfs.c         |    3 ++-

 drivers/pci/hotplug/rpadlpar_sysfs.c |    6 +++---

 fs/dlm/lockspace.c                   |    2 +-

 fs/gfs2/locking/dlm/sysfs.c          |    2 +-

 fs/gfs2/sys.c                        |    2 +-

 fs/ocfs2/cluster/masklog.c           |    3 ++-

 6 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/drivers/edac/edac_mc_sysfs.c b/drivers/edac/edac_mc_sysfs.c

index 4a0576b..3706b2b 100644

--- a/drivers/edac/edac_mc_sysfs.c

+++ b/drivers/edac/edac_mc_sysfs.c

@@ -743,7 +743,7 @@ static struct kobj_type ktype_mc_set_attribs = {

  *	/sys/devices/system/edac/mc

  */

 static struct kset mc_kset = {

-	.kobj = {.name = "mc", .ktype = &ktype_mc_set_attribs },

+	.kobj = {.ktype = &ktype_mc_set_attribs },

 	.ktype = &ktype_mci,

 };
@@ -1010,6 +1010,7 @@ int edac_sysfs_setup_mc_kset(void)

 	}
 	/* Init the MC's kobject */

+	kobject_set_name(&mc_kset.kobj, "mc");

 	mc_kset.kobj.parent = &edac_class->kset.kobj;
 	/* register the mc_kset */

diff --git a/drivers/pci/hotplug/rpadlpar_sysfs.c b/drivers/pci/hotplug/rpadlpar_sysfs.c

index df07606..a080fed 100644

--- a/drivers/pci/hotplug/rpadlpar_sysfs.c

+++ b/drivers/pci/hotplug/rpadlpar_sysfs.c

@@ -129,17 +129,17 @@ struct kobj_type ktype_dlpar_io = {

 };
 struct kset dlpar_io_kset = {

-	.kobj = {.name = DLPAR_KOBJ_NAME,

-		 .ktype = &ktype_dlpar_io,

+	.kobj = {.ktype = &ktype_dlpar_io,

 		 .parent = &pci_hotplug_slots_subsys.kobj},

 	.ktype = &ktype_dlpar_io,

 };
 int dlpar_sysfs_init(void)

 {

+	kobject_set_name(&dlpar_io_kset.kobj, DLPAR_KOBJ_NAME);

 	if (kset_register(&dlpar_io_kset)) {

 		printk(KERN_ERR "rpadlpar_io: cannot register kset for %s\n",

-				dl...
[ message continues ]

Due to historical reasons, struct kobject contained a static array for

the name, and a dynamic pointer in case the name got bigger than the

array.  That's just dumb, as people didn't always know which variable to

reference, even with the accessor for the kobject name.
This patch removes the static array, potentially saving a lot of memory

as the majority of kobjects do not have a very long name.
Thanks to Kay for the idea to do this.
Cc: Kay Sievers <kay.sievers@vrfy.org>

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---

 include/linux/kobject.h |    7 ++--

 lib/kobject.c           |   79 +++++++++++++++++++++++------------------------

 2 files changed, 42 insertions(+), 44 deletions(-)
diff --git a/include/linux/kobject.h b/include/linux/kobject.h

index c0fb535..8b45946 100644

--- a/include/linux/kobject.h

+++ b/include/linux/kobject.h

@@ -63,7 +63,6 @@ extern const char *kobject_actions[];
 struct kobject {

 	const char		* k_name;

-	char			name[KOBJ_NAME_LEN];

 	struct kref		kref;

 	struct list_head	entry;

 	struct kobject		* parent;

@@ -188,18 +187,18 @@ extern struct kobject * kset_find_obj(struct kset *, const char *);

  * Use this when initializing an embedded kset with no other

  * fields to initialize.

  */

-#define set_kset_name(str)	.kset = { .kobj = { .name = str } }

+#define set_kset_name(str)	.kset = { .kobj = { .k_name = str } }
 #define decl_subsys(_name,_type,_uevent_ops) \

 struct kset _name##_subsys = { \

-	.kobj = { .name = __stringify(_name) }, \

+	.kobj = { .k_name = __stringify(_name) }, \

 	.ktype = _type, \

 	.uevent_ops =_uevent_ops, \

 }

 #define decl_subsys_name(_varname,_name,_type,_uevent_ops) \

 struct kset _varname##_subsys = { \

-	.kobj = { .name = __stringify(_name) }, \

+	.kobj = { .k_name = __stringify(_name) }, \

 	.ktype = _type, \

 	.uevent_ops =_uevent_ops, \

 }

diff --git a/lib/kobject.c b/lib/kobject.c

index 1326041..10ae2eb 100644

--- a/lib/kobject.c

+++ b/lib/kobject.c

@@ -170,7 +170,7 @@ ...
[ message continues ]

From: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---

 Documentation/kobject.txt |   21 ++-------------------

 1 files changed, 2 insertions(+), 19 deletions(-)
diff --git a/Documentation/kobject.txt b/Documentation/kobject.txt

index 8ee49ee..5e7aca2 100644

--- a/Documentation/kobject.txt

+++ b/Documentation/kobject.txt

@@ -54,7 +54,6 @@ embedded in larger data structures and replace fields they duplicate.
 struct kobject {

 	const char		* k_name;

-	char			name[KOBJ_NAME_LEN];

 	struct kref		kref;

 	struct list_head	entry;

 	struct kobject		* parent;

@@ -223,18 +222,15 @@ decl_subsys(devices, &ktype_device, &device_uevent_ops);

 is equivalent to doing:
 struct kset devices_subsys = {

-     .kobj = {

-	   .name = "devices",

-     },

      .ktype = &ktype_devices,

      .uevent_ops = &device_uevent_ops,

 };

-

+kobject_set_name(&devices_subsys, name);
 The objects that are registered with a subsystem that use the

 subsystem's default list must have their kset ptr set properly. These

 objects may have embedded kobjects or ksets. The

-following helpers make setting the kset easier:

+following helper makes setting the kset easier:
 kobj_set_kset_s(obj,subsys)

@@ -242,22 +238,9 @@ kobj_set_kset_s(obj,subsys)

 - Assumes that obj->kobj exists, and is a struct kobject.

 - Sets the kset of that kobject to the kset <subsys>.
-

-kset_set_kset_s(obj,subsys)

-

-- Assumes that obj->kset exists, and is a struct kset.

-- Sets the kset of the embedded kobject to the kset <subsys>.

-

-subsys_set_kset(obj,subsys)

-

-- Assumes obj->subsys exists, and is a struct subsystem.

-- Sets obj->subsys.kset.kobj.kset to the subsystem's embedded kset.

-

 void subsystem_init(struct kset *s);

 int subsystem_register(struct kset *s);

 void subsystem_unregister(struct kset *s);

-struct kset *subsys_get(struct kset ...
[ message continues ]

From: Robin Getz <rgetz@blackfin.uclinux.org>
Allows debugfs helper functions to have a hex output, rather than just decimal
Signed-off-by: Robin Getz <rgetz@blackfin.uclinux.org>

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---

 fs/debugfs/file.c       |   36 ++++++++++++++++++++++++++++++++++++

 include/linux/debugfs.h |   27 +++++++++++++++++++++++++++

 2 files changed, 63 insertions(+), 0 deletions(-)
diff --git a/fs/debugfs/file.c b/fs/debugfs/file.c

index 2e124e0..a9b99c0 100644

--- a/fs/debugfs/file.c

+++ b/fs/debugfs/file.c

@@ -221,6 +221,42 @@ struct dentry *debugfs_create_u64(const char *name, mode_t mode,

 }

 EXPORT_SYMBOL_GPL(debugfs_create_u64);
+DEFINE_SIMPLE_ATTRIBUTE(fops_x8, debugfs_u8_get, debugfs_u8_set, "0x%02llx\n");

+

+DEFINE_SIMPLE_ATTRIBUTE(fops_x16, debugfs_u16_get, debugfs_u16_set, "0x%04llx\n");

+

+DEFINE_SIMPLE_ATTRIBUTE(fops_x32, debugfs_u32_get, debugfs_u32_set, "0x%08llx\n");

+

+/**

+ * debugfs_create_x8 - create a debugfs file that is used to read and write an unsigned 8-bit value

+ * debugfs_create_x16 - create a debugfs file that is used to read and write an unsigned 16-bit value

+ * debugfs_create_x32 - create a debugfs file that is used to read and write an unsigned 32-bit value

+ *

+ * These functions are exactly the same as the above functions, (but use a hex

+ * output for the decimal challenged) for details look at the above unsigned

+ * decimal functions.

+ */

+struct dentry *debugfs_create_x8(const char *name, mode_t mode,

+				 struct dentry *parent, u8 *value)

+{

+	return debugfs_create_file(name, mode, parent, value, &fops_x8);

+}

+EXPORT_SYMBOL_GPL(debugfs_create_x8);

+

+struct dentry *debugfs_create_x16(const char *name, mode_t mode,

+				 struct dentry *parent, u16 *value)

+{

+	return debugfs_create_file(name, mode, parent, value, &fops_x16);

+}

+EXPORT_SYMBOL_GPL(debugfs_create_x16);

+

+struct dentry *debugfs_create_x32(const char *name, mode_t mode,

+				 struct dentry *parent, u...
[ message continues ]

From: Dave Young <hidave.darkstar@gmail.com>
Use mutex instead of semaphore in sysfs/file.c : sys_buffer.
Signed-off-by: Dave Young <hidave.darkstar@gmail.com>

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---

 fs/sysfs/file.c |   14 +++++++-------

 1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c

index 3e1cc06..b21d11b 100644

--- a/fs/sysfs/file.c

+++ b/fs/sysfs/file.c

@@ -8,8 +8,8 @@

 #include <linux/namei.h>

 #include <linux/poll.h>

 #include <linux/list.h>

+#include <linux/mutex.h>

 #include <asm/uaccess.h>

-#include <asm/semaphore.h>
 #include "sysfs.h"
@@ -55,7 +55,7 @@ struct sysfs_buffer {

 	loff_t			pos;

 	char			* page;

 	struct sysfs_ops	* ops;

-	struct semaphore	sem;

+	struct mutex		mutex;

 	int			needs_read_fill;

 	int			event;

 };

@@ -128,7 +128,7 @@ sysfs_read_file(struct file *file, char __user *buf, size_t count, loff_t *ppos)

 	struct sysfs_buffer * buffer = file->private_data;

 	ssize_t retval = 0;
-	down(&buffer->sem);

+	mutex_lock(&buffer->mutex);

 	if (buffer->needs_read_fill) {

 		retval = fill_read_buffer(file->f_path.dentry,buffer);

 		if (retval)

@@ -139,7 +139,7 @@ sysfs_read_file(struct file *file, char __user *buf, size_t count, loff_t *ppos)

 	retval = simple_read_from_buffer(buf, count, ppos, buffer->page,

 					 buffer->count);

 out:

-	up(&buffer->sem);

+	mutex_unlock(&buffer->mutex);

 	return retval;

 }
@@ -228,13 +228,13 @@ sysfs_write_file(struct file *file, const char __user *buf, size_t count, loff_t

 	struct sysfs_buffer * buffer = file->private_data;

 	ssize_t len;
-	down(&buffer->sem);

+	mutex_lock(&buffer->mutex);

 	len = fill_write_buffer(buffer, buf, count);

 	if (len > 0)

 		len = flush_write_buffer(file->f_path.dentry, buffer, len);

 	if (len > 0)

 		*ppos += len;

-	up(&buffer->sem);

+	mutex_unlock(&buffer->m...
[ message continues ]

From: Dave Young <hidave.darkstar@gmail.com>
Cleanup semaphore.h
Signed-off-by: Dave Young <hidave.darkstar@gmail.com>

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---

 fs/sysfs/bin.c     |    2 +-

 fs/sysfs/dir.c     |    2 +-

 fs/sysfs/group.c   |    1 -

 fs/sysfs/inode.c   |    1 -

 fs/sysfs/mount.c   |    1 -

 fs/sysfs/symlink.c |    2 +-

 6 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/fs/sysfs/bin.c b/fs/sysfs/bin.c

index 5afe2a2..a819a7e 100644

--- a/fs/sysfs/bin.c

+++ b/fs/sysfs/bin.c

@@ -14,9 +14,9 @@

 #include <linux/kobject.h>

 #include <linux/module.h>

 #include <linux/slab.h>

+#include <linux/mutex.h>
 #include <asm/uaccess.h>

-#include <asm/semaphore.h>
 #include "sysfs.h"
diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c

index ea33b66..86d75e0 100644

--- a/fs/sysfs/dir.c

+++ b/fs/sysfs/dir.c

@@ -11,7 +11,7 @@

 #include <linux/namei.h>

 #include <linux/idr.h>

 #include <linux/completion.h>

-#include <asm/semaphore.h>

+#include <linux/mutex.h>

 #include "sysfs.h"
 DEFINE_MUTEX(sysfs_mutex);

diff --git a/fs/sysfs/group.c b/fs/sysfs/group.c

index f318b73..e6b904d 100644

--- a/fs/sysfs/group.c

+++ b/fs/sysfs/group.c

@@ -14,7 +14,6 @@

 #include <linux/namei.h>

 #include <linux/err.h>

 #include <linux/fs.h>

-#include <asm/semaphore.h>

 #include "sysfs.h"
diff --git a/fs/sysfs/inode.c b/fs/sysfs/inode.c

index 10d1b52..aecb6e7 100644

--- a/fs/sysfs/inode.c

+++ b/fs/sysfs/inode.c

@@ -14,7 +14,6 @@

 #include <linux/capability.h>

 #include <linux/errno.h>

 #include <linux/sched.h>

-#include <asm/semaphore.h>

 #include "sysfs.h"
 extern struct super_block * sysfs_sb;

diff --git a/fs/sysfs/mount.c b/fs/sysfs/mount.c

index fbc7b65..69a73ae 100644

--- a/fs/sysfs/mount.c

+++ b/fs/sysfs/mount.c

@@ -8,7 +8,6 @@

 #include <linux/mount.h>

 #include <linux/pagemap.h>

 #inclu...
[ message continues ]

From: Eric W. Biederman <ebiederm@xmission.com>
While shadow directories appear to be a good idea, the current scheme

of controlling their creation and destruction outside of sysfs appears

to be a locking and maintenance nightmare in the face of sysfs

directories dynamically coming and going.  Which can now occur for

directories containing network devices when CONFIG_SYSFS_DEPRECATED is

not set.
This patch removes everything from the initial shadow directory support

that allowed the shadow directory creation to be controlled at a higher

level.  So except for a few bits of sysfs_rename_dir everything from

commit b592fcfe7f06c15ec11774b5be7ce0de3aa86e73 is now gone.
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>

Signed-off-by: Tejun Heo <htejun@gmail.com>

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---

 fs/sysfs/dir.c          |  167 ++++++----------------------------------------

 fs/sysfs/group.c        |    1 -

 fs/sysfs/inode.c        |   10 ---

 fs/sysfs/mount.c        |    2 +-

 fs/sysfs/sysfs.h        |    6 --

 include/linux/kobject.h |    5 --

 include/linux/sysfs.h   |   27 +-------

 lib/kobject.c           |   44 ++-----------

 8 files changed, 33 insertions(+), 229 deletions(-)
diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c

index 86d75e0..837073d 100644

--- a/fs/sysfs/dir.c

+++ b/fs/sysfs/dir.c

@@ -569,9 +569,6 @@ static void sysfs_drop_dentry(struct sysfs_dirent *sd)

 	spin_unlock(&dcache_lock);

 	spin_unlock(&sysfs_assoc_lock);
-	/* dentries for shadowed inodes are pinned, unpin */

-	if (dentry && sysfs_is_shadowed_inode(dentry->d_inode))

-		dput(dentry);

 	dput(dentry);
 	/* adjust nlink and update timestamp */

@@ -723,19 +720,15 @@ int sysfs_create_subdir(struct kobject *kobj, const char *name,

 /**

  *	sysfs_create_dir - create a directory for an object.

  *	@kobj:		object we're creating directory for.

- *	@shadow_parent:	parent object.

  */

-int sysfs_create_dir(struct kobject *kobj,

...
[ message continues ]

From: Tejun Heo <htejun@gmail.com>
* remove space between * and symbol name in variable declaration.
* kill unnecessary new line.
* kill 'found' and test 'sd' instead.
Signed-off-by: Tejun Heo <htejun@gmail.com>

Acked-by: Cornelia Huck <cornelia.huck@de.ibm.com>

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---

 fs/sysfs/dir.c |   15 +++++----------

 1 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c

index 837073d..5da8da8 100644

--- a/fs/sysfs/dir.c

+++ b/fs/sysfs/dir.c

@@ -756,24 +756,19 @@ static struct dentry * sysfs_lookup(struct inode *dir, struct dentry *dentry,

 				struct nameidata *nd)

 {

 	struct dentry *ret = NULL;

-	struct sysfs_dirent * parent_sd = dentry->d_parent->d_fsdata;

-	struct sysfs_dirent * sd;

+	struct sysfs_dirent *parent_sd = dentry->d_parent->d_fsdata;

+	struct sysfs_dirent *sd;

 	struct bin_attribute *bin_attr;

 	struct inode *inode;

-	int found = 0;
 	mutex_lock(&sysfs_mutex);
-	for (sd = parent_sd->s_children; sd; sd = sd->s_sibling) {

-		if (sysfs_type(sd) &&

-		    !strcmp(sd->s_name, dentry->d_name.name)) {

-			found = 1;

+	for (sd = parent_sd->s_children; sd; sd = sd->s_sibling)

+		if (sysfs_type(sd) && !strcmp(sd->s_name, dentry->d_name.name))

 			break;

-		}

-	}
 	/* no such entry */

-	if (!found)

+	if (!sd)

 		goto out_unlock;
 	/* attach dentry and inode */

--

1.5.3.4
-

From: Tejun Heo <htejun@gmail.com>
With the shadow directories gone, sysfs_rename_dir() can be simplified.
* parent doesn't need to be grabbed separately.  Just access

  old_dentry->d_parent.
* parent sd can never change.  Remove code to move under the new

  parent.
* Massage comments a bit.
Signed-off-by: Tejun Heo <htejun@gmail.com>

Acked-by: Cornelia Huck <cornelia.huck@de.ibm.com>

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---

 fs/sysfs/dir.c |   26 ++++----------------------

 1 files changed, 4 insertions(+), 22 deletions(-)
diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c

index 5da8da8..9504d4c 100644

--- a/fs/sysfs/dir.c

+++ b/fs/sysfs/dir.c

@@ -883,14 +883,10 @@ int sysfs_rename_dir(struct kobject * kobj, const char *new_name)

 	struct sysfs_dirent *sd;

 	struct dentry *parent = NULL;

 	struct dentry *old_dentry = NULL, *new_dentry = NULL;

-	struct sysfs_dirent *parent_sd;

 	const char *dup_name = NULL;

 	int error;
-	if (!kobj->parent)

-		return -EINVAL;

-

-	/* get dentries */

+	/* get the original dentry */

 	sd = kobj->sd;

 	old_dentry = sysfs_get_dentry(sd);

 	if (IS_ERR(old_dentry)) {

@@ -898,12 +894,7 @@ int sysfs_rename_dir(struct kobject * kobj, const char *new_name)

 		goto out_dput;

 	}
-	parent_sd = kobj->parent->sd;

-	parent = sysfs_get_dentry(parent_sd);

-	if (IS_ERR(parent)) {

-		error = PTR_ERR(parent);

-		goto out_dput;

-	}

+	parent = old_dentry->d_parent;
 	/* lock parent and get dentry for new name */

 	mutex_lock(&parent->d_inode->i_mutex);

@@ -933,22 +924,14 @@ int sysfs_rename_dir(struct kobject * kobj, const char *new_name)

 		goto out_drop;
 	mutex_lock(&sysfs_mutex);

-

 	dup_name = sd->s_name;

 	sd->s_name = new_name;

+	mutex_unlock(&sysfs_mutex);
-	/* move under the new parent */

+	/* rename */

 	d_add(new_dentry, NULL);

 	d_move(sd->s_dentry, new_dentry);
-	sysfs_unlink_sibling(sd);

-	sysfs_get(parent_sd);

-	sysfs_put(sd-&...
[ message continues ]

From: Tejun Heo <htejun@gmail.com>
When adding or removing a sysfs_dirent, the user used to be required

to call link/unlink separately.  It was for two reasons - code looked

like that before sysfs_addrm_cxt conversion and to avoid looping

through parent_sd->children list twice during removal.
Performance optimization during removal just isn't worth it.  Make

sysfs_add/remove_one() call sysfs_link/unlink_sibing() implicitly.

This makes code simpler albeit slightly less efficient.  This change

doesn't introduce any noticeable behavior change.
Signed-off-by: Tejun Heo <htejun@gmail.com>

Acked-by: Cornelia Huck <cornelia.huck@de.ibm.com>

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---

 fs/sysfs/dir.c     |   21 ++++++++++-----------

 fs/sysfs/file.c    |    4 +---

 fs/sysfs/inode.c   |   17 ++++-------------

 fs/sysfs/symlink.c |    4 +---

 fs/sysfs/sysfs.h   |    2 --

 5 files changed, 16 insertions(+), 32 deletions(-)
diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c

index 9504d4c..354675a 100644

--- a/fs/sysfs/dir.c

+++ b/fs/sysfs/dir.c

@@ -30,7 +30,7 @@ static DEFINE_IDA(sysfs_ino_ida);

  *	Locking:

  *	mutex_lock(sysfs_mutex)

  */

-void sysfs_link_sibling(struct sysfs_dirent *sd)

+static void sysfs_link_sibling(struct sysfs_dirent *sd)

 {

 	struct sysfs_dirent *parent_sd = sd->s_parent;
@@ -49,7 +49,7 @@ void sysfs_link_sibling(struct sysfs_dirent *sd)

  *	Locking:

  *	mutex_lock(sysfs_mutex)

  */

-void sysfs_unlink_sibling(struct sysfs_dirent *sd)

+static void sysfs_unlink_sibling(struct sysfs_dirent *sd)

 {

 	struct sysfs_dirent **pos;
@@ -500,6 +500,8 @@ void sysfs_add_one(struct sysfs_addrm_cxt *acxt, struct sysfs_dirent *sd)

 		inc_nlink(acxt->parent_inode);
 	acxt->cnt++;

+

+	sysfs_link_sibling(sd);

 }
 /**

@@ -521,7 +523,9 @@ void sysfs_add_one(struct sysfs_addrm_cxt *acxt, struct sysfs_dirent *sd)

  */

 void sysfs_remove_one(struct sysfs_addrm_cxt *acxt, struct sysfs_dirent *sd)

 {

-	BUG_ON(sd->...
[ message continues ]

From: Tejun Heo <htejun@gmail.com>
Make sysfs_add_one() check for duplicate entry and return -EEXIST if

such entry exists.  This simplifies node addition code a bit.
This patch doesn't introduce any noticeable behavior change.
Signed-off-by: Tejun Heo <htejun@gmail.com>

Acked-by: Cornelia Huck <cornelia.huck@de.ibm.com>

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---

 fs/sysfs/dir.c     |   26 +++++++++++++++++---------

 fs/sysfs/file.c    |   12 +++++-------

 fs/sysfs/symlink.c |    9 +++------

 fs/sysfs/sysfs.h   |    2 +-

 4 files changed, 26 insertions(+), 23 deletions(-)
diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c

index 354675a..6206032 100644

--- a/fs/sysfs/dir.c

+++ b/fs/sysfs/dir.c

@@ -491,9 +491,16 @@ void sysfs_addrm_start(struct sysfs_addrm_cxt *acxt,

  *

  *	LOCKING:

  *	Determined by sysfs_addrm_start().

+ *

+ *	RETURNS:

+ *	0 on success, -EEXIST if entry with the given name already

+ *	exists.

  */

-void sysfs_add_one(struct sysfs_addrm_cxt *acxt, struct sysfs_dirent *sd)

+int sysfs_add_one(struct sysfs_addrm_cxt *acxt, struct sysfs_dirent *sd)

 {

+	if (sysfs_find_dirent(acxt->parent_sd, sd->s_name))

+		return -EEXIST;

+

 	sd->s_parent = sysfs_get(acxt->parent_sd);
 	if (sysfs_type(sd) == SYSFS_DIR && acxt->parent_inode)

@@ -502,6 +509,8 @@ void sysfs_add_one(struct sysfs_addrm_cxt *acxt, struct sysfs_dirent *sd)

 	acxt->cnt++;
 	sysfs_link_sibling(sd);

+

+	return 0;

 }
 /**

@@ -691,6 +700,7 @@ static int create_dir(struct kobject *kobj, struct sysfs_dirent *parent_sd,

 	umode_t mode = S_IFDIR| S_IRWXU | S_IRUGO | S_IXUGO;

 	struct sysfs_addrm_cxt acxt;

 	struct sysfs_dirent *sd;

+	int rc;
 	/* allocate */

 	sd = sysfs_new_dirent(name, mode, SYSFS_DIR);

@@ -700,17 +710,15 @@ static int create_dir(struct kobject *kobj, struct sysfs_dirent *parent_sd,
 	/* link in */

 	sysfs_addrm_start(&acxt, parent_sd);

+	rc = sysfs_add_one(&acxt, sd);

+	sysfs_addrm_finish(&amp...
[ message continues ]

From: Tejun Heo <htejun@gmail.com>
With the previous sysfs_add_one() update, there is only one user of

the return value of sysfs_addrm_finish() and the user can switch to

testing @sd easily.  Make sysfs_addrm_finish() return void for cleaner

semantics as suggested by Satyam Sharma.
This patch doesn't introduce any noticeable behavior change.
Signed-off-by: Tejun Heo <htejun@gmail.com>

Cc: Satyam Sharma <satyam.sharma@gmail.com>

Acked-by: Cornelia Huck <cornelia.huck@de.ibm.com>

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---

 fs/sysfs/dir.c   |    7 +------

 fs/sysfs/inode.c |    7 +++++--

 fs/sysfs/sysfs.h |    2 +-

 3 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c

index 6206032..a0da2b0 100644

--- a/fs/sysfs/dir.c

+++ b/fs/sysfs/dir.c

@@ -609,11 +609,8 @@ static void sysfs_drop_dentry(struct sysfs_dirent *sd)

  *

  *	LOCKING:

  *	All mutexes acquired by sysfs_addrm_start() are released.

- *

- *	RETURNS:

- *	Number of added/removed sysfs_dirents since sysfs_addrm_start().

  */

-int sysfs_addrm_finish(struct sysfs_addrm_cxt *acxt)

+void sysfs_addrm_finish(struct sysfs_addrm_cxt *acxt)

 {

 	/* release resources acquired by sysfs_addrm_start() */

 	mutex_unlock(&sysfs_mutex);

@@ -639,8 +636,6 @@ int sysfs_addrm_finish(struct sysfs_addrm_cxt *acxt)

 		sysfs_deactivate(sd);

 		sysfs_put(sd);

 	}

-

-	return acxt->cnt;

 }
 /**

diff --git a/fs/sysfs/inode.c b/fs/sysfs/inode.c

index efb4062..e22db6c 100644

--- a/fs/sysfs/inode.c

+++ b/fs/sysfs/inode.c

@@ -200,7 +200,10 @@ int sysfs_hash_and_remove(struct sysfs_dirent *dir_sd, const char *name)

 	if (sd)

 		sysfs_remove_one(&acxt, sd);
-	if (sysfs_addrm_finish(&acxt))

+	sysfs_addrm_finish(&acxt);

+

+	if (sd)

 		return 0;

-	return -ENOENT;

+	else

+		return -ENOENT;

 }

diff --git a/fs/sysfs/sysfs.h b/fs/sysfs/sysfs.h

index bb3f0c9..0436754 100644

--- a/fs/sysfs/sysfs.h

+++ b/fs/sysfs/sysfs.h

@@ -66,7 +...
[ message continues ]

From: Jean Delvare <khali@linux-fr.org>
We can use sysfs attributes with an extra parameter for dmi id

attributes. This makes it possible to use the same callback function

for all attributes, reducing the binary size significantly (-18% on

x86_64.)
Signed-off-by: Jean Delvare <khali@linux-fr.org>

Acked-by: Lennart Poettering <mzxreary@0pointer.de>

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---

 drivers/firmware/dmi-id.c |   38 ++++++++++++++++++++++++++------------

 1 files changed, 26 insertions(+), 12 deletions(-)
diff --git a/drivers/firmware/dmi-id.c b/drivers/firmware/dmi-id.c

index 2678098..a7bd87d 100644

--- a/drivers/firmware/dmi-id.c

+++ b/drivers/firmware/dmi-id.c

@@ -13,21 +13,35 @@

 #include <linux/device.h>

 #include <linux/autoconf.h>
+struct dmi_device_attribute{

+	struct device_attribute dev_attr;

+	int field;

+};

+#define to_dmi_dev_attr(_dev_attr) \

+	container_of(_dev_attr, struct dmi_device_attribute, dev_attr)

+

 #define DEFINE_DMI_ATTR(_name, _mode, _show)		\

 static struct device_attribute sys_dmi_##_name##_attr =	\

 	__ATTR(_name, _mode, _show, NULL);
-#define DEFINE_DMI_ATTR_WITH_SHOW(_name, _mode, _field)			\

-static ssize_t sys_dmi_##_name##_show(struct device *dev,		\

-				      struct device_attribute *attr,	\

-				      char *page)			\

-{									\

-	ssize_t len;							\

-	len = scnprintf(page, PAGE_SIZE, "%s\n", dmi_get_system_info(_field)); \

-	page[len-1] = '\n';						\

-	return len;							\

-}									\

-DEFINE_DMI_ATTR(_name, _mode, sys_dmi_##_name##_show);

+static ssize_t sys_dmi_field_show(struct device *dev,

+				  struct device_attribute *attr,

+				  char *page)

+{

+	int field = to_dmi_dev_attr(attr)->field;

+	ssize_t len;

+	len = scnprintf(page, PAGE_SIZE, "%s\n", dmi_get_system_info(field));

+	page[len-1] = '\n';

+	return len;

+}

+

+#define DMI_ATTR(_name, _mode, _show, _field)			\

+	{ .dev_attr = __ATTR(_name, _mode, _show, NULL),	\

+	  .field = _field }

+

+#d...
[ message continues ]

From: Jean Delvare <khali@linux-fr.org>
The DEFINE_DMI_ATTR macro has a single user left so we can expand it

for slightly shorter/simpler code.
Signed-off-by: Jean Delvare <khali@linux-fr.org>

Acked-by: Lennart Poettering <mzxreary@0pointer.de>

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---

 drivers/firmware/dmi-id.c |    7 ++-----

 1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/drivers/firmware/dmi-id.c b/drivers/firmware/dmi-id.c

index a7bd87d..b6e1eb7 100644

--- a/drivers/firmware/dmi-id.c

+++ b/drivers/firmware/dmi-id.c

@@ -20,10 +20,6 @@ struct dmi_device_attribute{

 #define to_dmi_dev_attr(_dev_attr) \

 	container_of(_dev_attr, struct dmi_device_attribute, dev_attr)
-#define DEFINE_DMI_ATTR(_name, _mode, _show)		\

-static struct device_attribute sys_dmi_##_name##_attr =	\

-	__ATTR(_name, _mode, _show, NULL);

-

 static ssize_t sys_dmi_field_show(struct device *dev,

 				  struct device_attribute *attr,

 				  char *page)

@@ -135,7 +131,8 @@ static ssize_t sys_dmi_modalias_show(struct device *dev,

 	return r+1;

 }
-DEFINE_DMI_ATTR(modalias, 0444, sys_dmi_modalias_show);

+static struct device_attribute sys_dmi_modalias_attr =

+	__ATTR(modalias, 0444, sys_dmi_modalias_show, NULL);
 static struct attribute *sys_dmi_attributes[DMI_STRING_MAX+2];
--

1.5.3.4
-

From: tonyj@suse.de <tonyj@suse.de>
Convert from class_device to device for drivers/video.
Signed-off-by: Tony Jones <tonyj@suse.de>

Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---

 drivers/acpi/video.c         |    4 ++--

 drivers/video/output.c       |   29 ++++++++++++++++-------------

 include/linux/video_output.h |    4 ++--

 3 files changed, 20 insertions(+), 17 deletions(-)
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c

index d05891f..b8a2095 100644

--- a/drivers/acpi/video.c

+++ b/drivers/acpi/video.c

@@ -316,7 +316,7 @@ static int acpi_video_output_get(struct output_device *od)

 {

 	unsigned long state;

 	struct acpi_video_device *vd =

-		(struct acpi_video_device *)class_get_devdata(&od->class_dev);

+		(struct acpi_video_device *)dev_get_drvdata(&od->dev);

 	acpi_video_device_get_state(vd, &state);

 	return (int)state;

 }

@@ -325,7 +325,7 @@ static int acpi_video_output_set(struct output_device *od)

 {

 	unsigned long state = od->request_state;

 	struct acpi_video_device *vd=

-		(struct acpi_video_device *)class_get_devdata(&od->class_dev);

+		(struct acpi_video_device *)dev_get_drvdata(&od->dev);

 	return acpi_video_device_set_state(vd, state);

 }
diff --git a/drivers/video/output.c b/drivers/video/output.c

index 1473f2c..f2df551 100644

--- a/drivers/video/output.c

+++ b/drivers/video/output.c

@@ -31,7 +31,8 @@ MODULE_DESCRIPTION("Display Output Switcher Lowlevel Control Abstraction");

 MODULE_LICENSE("GPL");

 MODULE_AUTHOR("Luming Yu <luming.yu@intel.com>");
-static ssize_t video_output_show_state(struct class_device *dev,char *buf)

+static ssize_t video_output_show_state(struct device *dev,

+				       struct device_attribute *attr, char *buf)

 {

 	ssize_t ret_size = 0;

 	struct output_device *od = to_output_device(dev);

@@ -40,8 +41,9 @@ static ssize_t video_output_show_state(struct class_device *dev,char *buf)

 	...
[ message continues ]

From: tonyj@suse.de <tonyj@suse.de>
Convert from class_device to device in drivers/char.
Signed-off-by: Tony Jones <tonyj@suse.de>

Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---

 drivers/char/dsp56k.c            |    4 ++--

 drivers/char/ip2/ip2main.c       |   12 ++++++------

 drivers/char/ipmi/ipmi_devintf.c |    6 +++---

 drivers/char/istallion.c         |    8 +++-----

 drivers/char/lp.c                |    5 ++---

 drivers/char/pcmcia/cm4000_cs.c  |    5 ++---

 drivers/char/pcmcia/cm4040_cs.c  |    5 ++---

 drivers/char/snsc.c              |    3 +--

 drivers/char/stallion.c          |    7 +++----

 drivers/char/tipar.c             |    6 +++---

 drivers/char/viotape.c           |   10 +++++-----

 11 files changed, 32 insertions(+), 39 deletions(-)
diff --git a/drivers/char/dsp56k.c b/drivers/char/dsp56k.c

index 9b8278e..acbfe1c 100644

--- a/drivers/char/dsp56k.c

+++ b/drivers/char/dsp56k.c

@@ -513,7 +513,7 @@ static int __init dsp56k_init_driver(void)

 		err = PTR_ERR(dsp56k_class);

 		goto out_chrdev;

 	}

-	class_device_create(dsp56k_class, NULL, MKDEV(DSP56K_MAJOR, 0), NULL, "dsp56k");

+	device_create(dsp56k_class, NULL, MKDEV(DSP56K_MAJOR, 0), "dsp56k");
 	printk(banner);

 	goto out;

@@ -527,7 +527,7 @@ module_init(dsp56k_init_driver);
 static void __exit dsp56k_cleanup_driver(void)

 {

-	class_device_destroy(dsp56k_class, MKDEV(DSP56K_MAJOR, 0));

+	device_destroy(dsp56k_class, MKDEV(DSP56K_MAJOR, 0));

 	class_destroy(dsp56k_class);

 	unregister_chrdev(DSP56K_MAJOR, "dsp56k");

 }

diff --git a/drivers/char/ip2/ip2main.c b/drivers/char/ip2/ip2main.c

index 8d74b87..bd94d5f 100644

--- a/drivers/char/ip2/ip2main.c

+++ b/drivers/char/ip2/ip2main.c

@@ -411,8 +411,8 @@ cleanup_module(void)

 			iiResetDelay( i2BoardPtrTable[i] );

 			/* free io addresses and Tibet */

 			release_region( ip2config.addr[i], 8 );

-			class_device_destroy(ip2_class, MKDEV(IP2_IPL_MAJOR, 4 * i));

...
[ message continues ]

From: Kay Sievers <kay.sievers@vrfy.org>
Move uevent specific logic from the core into kobject_uevent.c, which

does no longer require to link the unused string array if hotplug

is not compiled in.
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---

 drivers/base/core.c     |   18 +++-----------

 include/linux/kobject.h |   10 +++++--

 lib/Makefile            |    3 +-

 lib/kobject_uevent.c    |   57 ++++++++++++++++++++++++++++++++++++----------

 4 files changed, 57 insertions(+), 31 deletions(-)
diff --git a/drivers/base/core.c b/drivers/base/core.c

index d487c03..65de221 100644

--- a/drivers/base/core.c

+++ b/drivers/base/core.c

@@ -234,13 +234,11 @@ static ssize_t show_uevent(struct device *dev, struct device_attribute *attr,
 	/* search the kset, the device belongs to */

 	top_kobj = &dev->kobj;

-	if (!top_kobj->kset && top_kobj->parent) {

-		do {

-			top_kobj = top_kobj->parent;

-		} while (!top_kobj->kset && top_kobj->parent);

-	}

+	while (!top_kobj->kset && top_kobj->parent)

+		top_kobj = top_kobj->parent;

 	if (!top_kobj->kset)

 		goto out;

+

 	kset = top_kobj->kset;

 	if (!kset->uevent_ops || !kset->uevent_ops->uevent)

 		goto out;

@@ -270,17 +268,9 @@ out:

 static ssize_t store_uevent(struct device *dev, struct device_attribute *attr,

 			    const char *buf, size_t count)

 {

-	size_t len = count;

 	enum kobject_action action;
-	if (len && buf[len-1] == '\n')

-		len--;

-

-	for (action = 0; action < KOBJ_MAX; action++) {

-		if (strncmp(kobject_actions[action], buf, len) != 0)

-			continue;

-		if (kobject_actions[action][len] != '\0')

-			continue;

+	if (kobject_action_type(buf, count, &action) == 0) {

 		kobject_uevent(&dev->kobj, action);

 		goto out;

 	}

diff --git a/include/linux/kobject.h b/include/linux/kobject.h

index 56f5eaf..0777b3f 100644

--- a/include/linux/kobject.h

+++...
[ message continues ]

From: Kay Sievers <kay.sievers@vrfy.org>
This has been in the SuSE kernels for some time now.
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---

 drivers/base/bus.c |   35 +++++++++++++++++++++++++++++++++++

 1 files changed, 35 insertions(+), 0 deletions(-)
diff --git a/drivers/base/bus.c b/drivers/base/bus.c

index 0a8d075..6768a01 100644

--- a/drivers/base/bus.c

+++ b/drivers/base/bus.c

@@ -610,6 +610,17 @@ static inline int add_probe_files(struct bus_type *bus) { return 0; }

 static inline void remove_probe_files(struct bus_type *bus) {}

 #endif
+static ssize_t driver_uevent_store(struct device_driver *drv,

+				   const char *buf, size_t count)

+{

+	enum kobject_action action;

+

+	if (kobject_action_type(buf, count, &action) == 0)

+		kobject_uevent(&drv->kobj, action);

+	return count;

+}

+static DRIVER_ATTR(uevent, S_IWUSR, NULL, driver_uevent_store);

+

 /**

  *	bus_add_driver - Add a driver to the bus.

  *	@drv:	driver.

@@ -640,6 +651,11 @@ int bus_add_driver(struct device_driver *drv)

 	klist_add_tail(&drv->knode_bus, &bus->klist_drivers);

 	module_add_driver(drv->owner, drv);
+	error = driver_create_file(drv, &driver_attr_uevent);

+	if (error) {

+		printk(KERN_ERR "%s: uevent attr (%s) failed\n",

+			__FUNCTION__, drv->name);

+	}

 	error = driver_add_attrs(bus, drv);

 	if (error) {

 		/* How the hell do we get out of this pickle? Give up */

@@ -677,6 +693,7 @@ void bus_remove_driver(struct device_driver * drv)
 	remove_bind_files(drv);

 	driver_remove_attrs(drv->bus, drv);

+	driver_remove_file(drv, &driver_attr_uevent);

 	klist_remove(&drv->knode_bus);

 	pr_debug("bus %s: remove driver %s\n", drv->bus->name, drv->name);

 	driver_detach(drv);

@@ -804,6 +821,17 @@ static void klist_devices_put(struct klist_node *n)

 	put_device(dev);

 }
+static ssize_t bus_uevent_store(struct bus_type *bus,

+				const char *buf, s...
[ message continues ]

From: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---

 lib/kobject_uevent.c |    8 ++++----

 1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/lib/kobject_uevent.c b/lib/kobject_uevent.c

index a8efb48..2e4eae5 100644

--- a/lib/kobject_uevent.c

+++ b/lib/kobject_uevent.c

@@ -77,7 +77,7 @@ out:

 /**

  * kobject_uevent_env - send an uevent with environmental data

  *

- * @action: action that is happening (usually KOBJ_MOVE)

+ * @action: action that is happening

  * @kobj: struct kobject that the action is happening to

  * @envp_ext: pointer to environmental data

  *

@@ -102,9 +102,9 @@ int kobject_uevent_env(struct kobject *kobj, enum kobject_action action,
 	/* search the kset we belong to */

 	top_kobj = kobj;

-	while (!top_kobj->kset && top_kobj->parent) {

+	while (!top_kobj->kset && top_kobj->parent)

 		top_kobj = top_kobj->parent;

-	}

+

 	if (!top_kobj->kset) {

 		pr_debug("kobject attempted to send uevent without kset!\n");

 		return -EINVAL;

@@ -237,7 +237,7 @@ EXPORT_SYMBOL_GPL(kobject_uevent_env);

 /**

  * kobject_uevent - notify userspace by ending an uevent

  *

- * @action: action that is happening (usually KOBJ_ADD and KOBJ_REMOVE)

+ * @action: action that is happening

  * @kobj: struct kobject that the action is happening to

  *

  * Returns 0 if kobject_uevent() is completed with success or the

--

1.5.3.4
-

From: Markus Rechberger <markus.rechberger@amd.com>
following patch fixes the i2c name collision with i2c-dev.
http://mcentral.de/wiki/index.php/Bugtracker#i2c_core_problem
This issue has been experienced with em28xx and saa7133 based devices.

I discussed that problem with Jean Delvare a while ago and he proposed

to add a prefix to the class name.
Signed-off-by: Markus Rechberger <markus.rechberger@amd.com>

Acked-by: Marcel Holtmann <marcel@holtmann.org>

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---

 drivers/base/firmware_class.c |    3 +--

 1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c

index 4a1b9bf..0295855 100644

--- a/drivers/base/firmware_class.c

+++ b/drivers/base/firmware_class.c

@@ -292,8 +292,7 @@ firmware_class_timeout(u_long data)
 static inline void fw_setup_device_id(struct device *f_dev, struct device *dev)

 {

-	/* XXX warning we should watch out for name collisions */

-	strlcpy(f_dev->bus_id, dev->bus_id, BUS_ID_SIZE);

+	snprintf(f_dev->bus_id, BUS_ID_SIZE, "firmware-%s", dev->bus_id);

 }
 static int fw_register_device(struct device **dev_p, const char *fw_name,

--

1.5.3.4
-

From: Adrian Bunk <bunk@stusta.de>
suspend_device() and resume_device() can now become static.
Signed-off-by: Adrian Bunk <bunk@stusta.de>

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---

 drivers/base/power/power.h   |    6 ------

 drivers/base/power/resume.c  |    2 +-

 drivers/base/power/suspend.c |    2 +-

 3 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/drivers/base/power/power.h b/drivers/base/power/power.h

index 8ba0830..49e64db 100644

--- a/drivers/base/power/power.h

+++ b/drivers/base/power/power.h

@@ -55,12 +55,6 @@ extern void dpm_sysfs_remove(struct device *);
 extern void dpm_resume(void);

 extern void dpm_power_up(void);

-extern int resume_device(struct device *);

-

-/*

- * suspend.c

- */

-extern int suspend_device(struct device *, pm_message_t);
 #else /* CONFIG_PM_SLEEP */
diff --git a/drivers/base/power/resume.c b/drivers/base/power/resume.c

index 00fd84a..67948ba 100644

--- a/drivers/base/power/resume.c

+++ b/drivers/base/power/resume.c

@@ -20,7 +20,7 @@

  *

  */
-int resume_device(struct device * dev)

+static int resume_device(struct device * dev)

 {

 	int error = 0;
diff --git a/drivers/base/power/suspend.c b/drivers/base/power/suspend.c

index 26df9b2..204517a 100644

--- a/drivers/base/power/suspend.c

+++ b/drivers/base/power/suspend.c

@@ -54,7 +54,7 @@ suspend_device_dbg(struct device *dev, pm_message_t state, char *info)

  *	@state:	Power state device is entering.

  */
-int suspend_device(struct device * dev, pm_message_t state)

+static int suspend_device(struct device * dev, pm_message_t state)

 {

 	int error = 0;
--

1.5.3.4
-

From: Rolf Eike Beer <eike-kernel@sf-tec.de>
Signed-off-by: Rolf Eike Beer <eike-kernel@sf-tec.de>

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---

 fs/sysfs/file.c |    2 +-

 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c

index 33bb340..16f39c3 100644

--- a/fs/sysfs/file.c

+++ b/fs/sysfs/file.c

@@ -335,7 +335,7 @@ static int sysfs_release(struct inode * inode, struct file * filp)

  * again will not get new data, or reset the state of 'poll'.

  * Reminder: this only works for attributes which actively support

  * it, and it is not possible to test an attribute from userspace

- * to see if it supports poll (Nether 'poll' or 'select' return

+ * to see if it supports poll (Neither 'poll' nor 'select' return

  * an appropriate error code).  When in doubt, set a suitable timeout value.

  */

 static unsigned int sysfs_poll(struct file *filp, poll_table *wait)

--

1.5.3.4
-

From: Akinobu Mita <akinobu.mita@gmail.com>
No one uses sysdev_drivers. Because no one calls sysdev_driver_register

with NULL class.
And it is difficult to imagine that someone want to implement a global

sysdev driver which is called with all sys_device on any kind of

sysdev_class.
So this patch removes global sysdev_drivers list and update comments

for this change.
Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>

Cc: Tejun Heo <htejun@gmail.com>

Acked-by: Cornelia Huck <cornelia.huck@de.ibm.com>

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---

 drivers/base/sys.c |   71 ++++++++++-----------------------------------------

 1 files changed, 14 insertions(+), 57 deletions(-)
diff --git a/drivers/base/sys.c b/drivers/base/sys.c

index 7ad8931..ac7ff6d 100644

--- a/drivers/base/sys.c

+++ b/drivers/base/sys.c

@@ -153,25 +153,22 @@ void sysdev_class_unregister(struct sysdev_class * cls)

 EXPORT_SYMBOL_GPL(sysdev_class_register);

 EXPORT_SYMBOL_GPL(sysdev_class_unregister);
-

-static LIST_HEAD(sysdev_drivers);

 static DEFINE_MUTEX(sysdev_drivers_lock);
 /**

  *	sysdev_driver_register - Register auxillary driver

- * 	@cls:	Device class driver belongs to.

+ *	@cls:	Device class driver belongs to.

  *	@drv:	Driver.

  *

- *	If @cls is valid, then @drv is inserted into @cls->drivers to be

+ *	@drv is inserted into @cls->drivers to be

  *	called on each operation on devices of that class. The refcount

  *	of @cls is incremented.

- *	Otherwise, @drv is inserted into sysdev_drivers, and called for

- *	each device.

  */
-int sysdev_driver_register(struct sysdev_class * cls,

-			   struct sysdev_driver * drv)

+int sysdev_driver_register(struct sysdev_class *cls, struct sysdev_driver *drv)

 {

+	int err = 0;

+

 	mutex_lock(&sysdev_drivers_lock);

 	if (cls && kset_get(&cls->kset)) {

 		list_add_tail(&drv->entry, &cls->drivers);

@@ -182,10 +179,13 @@ int sysdev_driver_register(struct sysdev_c...
[ message continues ]

From: Jean Delvare <khali@linux-fr.org>
While platform_device.id is a u32, platform_device_add() handles "-1"

as a special id value. This has potential for confusion and bugs.

Making it an int instead should prevent problems from happening in

the future.
Signed-off-by: Jean Delvare <khali@linux-fr.org>

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---

 drivers/base/platform.c         |    7 ++++---

 include/linux/platform_device.h |    7 ++++---

 2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/drivers/base/platform.c b/drivers/base/platform.c

index a2e3910..fb56092 100644

--- a/drivers/base/platform.c

+++ b/drivers/base/platform.c

@@ -161,7 +161,7 @@ static void platform_device_release(struct device *dev)

  *	Create a platform device object which can have other objects attached

  *	to it, and which will have attached objects freed when it is released.

  */

-struct platform_device *platform_device_alloc(const char *name, unsigned int id)

+struct platform_device *platform_device_alloc(const char *name, int id)

 {

 	struct platform_object *pa;
@@ -245,7 +245,8 @@ int platform_device_add(struct platform_device *pdev)

 	pdev->dev.bus = &platform_bus_type;
 	if (pdev->id != -1)

-		snprintf(pdev->dev.bus_id, BUS_ID_SIZE, "%s.%u", pdev->name, pdev->id);

+		snprintf(pdev->dev.bus_id, BUS_ID_SIZE, "%s.%d", pdev->name,

+			 pdev->id);

 	else

 		strlcpy(pdev->dev.bus_id, pdev->name, BUS_ID_SIZE);
@@ -359,7 +360,7 @@ EXPORT_SYMBOL_GPL(platform_device_unregister);

  *	the Linux driver model.  In particular, when such drivers are built

  *	as modules, they can't be "hotplugged".

  */

-struct platform_device *platform_device_register_simple(char *name, unsigned int id,

+struct platform_device *platform_device_register_simple(char *name, int id,

 							struct resource *res, unsigned int num)

 {

 	struct platform_device *pdev;

diff --git a/include/linux/platform_device.h b/include/linux/platform_device.h

...
[ message continues ]

From: Tejun Heo <htejun@gmail.com>
lookup_one_len_kern() should be called with the parent's i_mutex

locked.  Fix it.
Spotted by Eric W. Biederman.
Signed-off-by: Tejun Heo <htejun@gmail.com>

Cc: Eric W. Biederman <ebiederm@xmission.com>

Cc: Cornelia Huck <cornelia.huck@de.ibm.com>

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---

 fs/sysfs/dir.c |    2 ++

 1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c

index a0da2b0..54ca4bc 100644

--- a/fs/sysfs/dir.c

+++ b/fs/sysfs/dir.c

@@ -130,8 +130,10 @@ struct dentry *sysfs_get_dentry(struct sysfs_dirent *sd)
 		/* look it up */

 		parent_dentry = dentry;

+		mutex_lock(&parent_dentry->d_inode->i_mutex);

 		dentry = lookup_one_len_kern(cur->s_name, parent_dentry,

 					     strlen(cur->s_name));

+		mutex_unlock(&parent_dentry->d_inode->i_mutex);

 		dput(parent_dentry);
 		if (IS_ERR(dentry)) {

--

1.5.3.4
-

From: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>

Signed-off-by: Tejun Heo <htejun@gmail.com>

Cc: Cornelia Huck <cornelia.huck@de.ibm.com>

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---

 fs/sysfs/dir.c   |   37 -------------------------------------

 fs/sysfs/inode.c |   48 +++++++++++++++++++++++++++++++++++++++++++++---

 fs/sysfs/mount.c |    5 -----

 3 files changed, 45 insertions(+), 45 deletions(-)
diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c

index 54ca4bc..5a70a93 100644

--- a/fs/sysfs/dir.c

+++ b/fs/sysfs/dir.c

@@ -748,24 +748,12 @@ int sysfs_create_dir(struct kobject * kobj)

 	return error;

 }
-static int sysfs_count_nlink(struct sysfs_dirent *sd)

-{

-	struct sysfs_dirent *child;

-	int nr = 0;

-

-	for (child = sd->s_children; child; child = child->s_sibling)

-		if (sysfs_type(child) == SYSFS_DIR)

-			nr++;

-	return nr + 2;

-}

-

 static struct dentry * sysfs_lookup(struct inode *dir, struct dentry *dentry,

 				struct nameidata *nd)

 {

 	struct dentry *ret = NULL;

 	struct sysfs_dirent *parent_sd = dentry->d_parent->d_fsdata;

 	struct sysfs_dirent *sd;

-	struct bin_attribute *bin_attr;

 	struct inode *inode;
 	mutex_lock(&sysfs_mutex);

@@ -785,31 +773,6 @@ static struct dentry * sysfs_lookup(struct inode *dir, struct dentry *dentry,

 		goto out_unlock;

 	}
-	if (inode->i_state & I_NEW) {

-		/* initialize inode according to type */

-		switch (sysfs_type(sd)) {

-		case SYSFS_DIR:

-			inode->i_op = &sysfs_dir_inode_operations;

-			inode->i_fop = &sysfs_dir_operations;

-			inode->i_nlink = sysfs_count_nlink(sd);

-			break;

-		case SYSFS_KOBJ_ATTR:

-			inode->i_size = PAGE_SIZE;

-			inode->i_fop = &sysfs_file_operations;

-			break;

-		case SYSFS_KOBJ_BIN_ATTR:

-			bin_attr = sd->s_elem.bin_attr.bin_attr;

-			inode->i_size = bin_attr->size;

-			inode->i_fop = &bin_fops;

-			break;

-		ca...
[ message continues ]

From: Eric W. Biederman <ebiederm@xmission.com>
Now that sysfs_get_inode is dropping the inode lock

we no longer have a need from sysfs_instantiate.
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>

Signed-off-by: Tejun Heo <htejun@gmail.com>

Cc: Cornelia Huck <cornelia.huck@de.ibm.com>

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---

 fs/sysfs/dir.c   |    2 +-

 fs/sysfs/inode.c |   17 -----------------

 fs/sysfs/sysfs.h |    1 -

 3 files changed, 1 insertions(+), 19 deletions(-)
diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c

index 5a70a93..739dda1 100644

--- a/fs/sysfs/dir.c

+++ b/fs/sysfs/dir.c

@@ -773,7 +773,7 @@ static struct dentry * sysfs_lookup(struct inode *dir, struct dentry *dentry,

 		goto out_unlock;

 	}
-	sysfs_instantiate(dentry, inode);

+	d_instantiate(dentry, inode);

 	sysfs_attach_dentry(sd, dentry);
  out_unlock:

diff --git a/fs/sysfs/inode.c b/fs/sysfs/inode.c

index 200e1bf..0d706a8 100644

--- a/fs/sysfs/inode.c

+++ b/fs/sysfs/inode.c

@@ -211,23 +211,6 @@ struct inode * sysfs_get_inode(struct sysfs_dirent *sd)

 	return inode;

 }
-/**

- *	sysfs_instantiate - instantiate dentry

- *	@dentry: dentry to be instantiated

- *	@inode: inode associated with @sd

- *

- *	Unlock @inode if locked and instantiate @dentry with @inode.

- *

- *	LOCKING:

- *	None.

- */

-void sysfs_instantiate(struct dentry *dentry, struct inode *inode)

-{

-	BUG_ON(!dentry || dentry->d_inode);

-

-	d_instantiate(dentry, inode);

-}

-

 int sysfs_hash_and_remove(struct sysfs_dirent *dir_sd, const char *name)

 {

 	struct sysfs_addrm_cxt acxt;

diff --git a/fs/sysfs/sysfs.h b/fs/sysfs/sysfs.h

index 0436754..8a0aea1 100644

--- a/fs/sysfs/sysfs.h

+++ b/fs/sysfs/sysfs.h

@@ -69,7 +69,6 @@ extern void sysfs_remove_one(struct sysfs_addrm_cxt *acxt,

 extern void sysfs_addrm_finish(struct sysfs_addrm_cxt *acxt);
 extern struct inode * sysfs_get_inode(struct sysfs_dirent *sd);

-extern void sysfs_instantiate(struct dentry *dentry...
[ message continues ]

From: Eric W. Biederman <ebiederm@xmission.com>
Since sysfs no longer stores fs directory information in the dcache

on a permanent basis kill_litter_super it is inappropriate and actively

wrong.  It will decrement the count on all dentries left in the

dcache before trying to free them.
At the moment this is not biting us only because we never unmount sysfs.
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>

Signed-off-by: Tejun Heo <htejun@gmail.com>

Cc: Cornelia Huck <cornelia.huck@de.ibm.com>

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---

 fs/sysfs/mount.c |    2 +-

 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/fs/sysfs/mount.c b/fs/sysfs/mount.c

index 92f407f..ac76256 100644

--- a/fs/sysfs/mount.c

+++ b/fs/sysfs/mount.c

@@ -71,7 +71,7 @@ static int sysfs_get_sb(struct file_system_type *fs_type,

 static struct file_system_type sysfs_fs_type = {

 	.name		= "sysfs",

 	.get_sb		= sysfs_get_sb,

-	.kill_sb	= kill_litter_super,

+	.kill_sb	= kill_anon_super,

 };
 int __init sysfs_init(void)

--

1.5.3.4
-

From: Eric W. Biederman <ebiederm@xmission.com>
This patch modifies the users of sysfs_mount to use sysfs_root

instead (which is what they are looking for).  It then

makes sysfs_mount static to keep people from using it

by accident.
The net result is slightly faster and cleaner code.
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>

Signed-off-by: Tejun Heo <htejun@gmail.com>

Cc: Cornelia Huck <cornelia.huck@de.ibm.com>

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---

 fs/sysfs/dir.c     |    4 +---

 fs/sysfs/mount.c   |    2 +-

 fs/sysfs/symlink.c |    7 +++----

 fs/sysfs/sysfs.h   |    1 -

 4 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c

index 739dda1..7f4abe1 100644

--- a/fs/sysfs/dir.c

+++ b/fs/sysfs/dir.c

@@ -737,10 +737,8 @@ int sysfs_create_dir(struct kobject * kobj)
 	if (kobj->parent)

 		parent_sd = kobj->parent->sd;

-	else if (sysfs_mount && sysfs_mount->mnt_sb)

-		parent_sd = sysfs_mount->mnt_sb->s_root->d_fsdata;

 	else

-		return -EFAULT;

+		parent_sd = &sysfs_root;
 	error = create_dir(kobj, parent_sd, kobject_name(kobj), &sd);

 	if (!error)

diff --git a/fs/sysfs/mount.c b/fs/sysfs/mount.c

index ac76256..8989cbb 100644

--- a/fs/sysfs/mount.c

+++ b/fs/sysfs/mount.c

@@ -14,7 +14,7 @@

 /* Random magic number */

 #define SYSFS_MAGIC 0x62656572
-struct vfsmount *sysfs_mount;

+static struct vfsmount *sysfs_mount;

 struct super_block * sysfs_sb = NULL;

 struct kmem_cache *sysfs_dir_cachep;
diff --git a/fs/sysfs/symlink.c b/fs/sysfs/symlink.c

index a6b13f1..8ad38bc 100644

--- a/fs/sysfs/symlink.c

+++ b/fs/sysfs/symlink.c

@@ -60,10 +60,9 @@ int sysfs_create_link(struct kobject * kobj, struct kobject * target, const char
 	BUG_ON(!name);
-	if (!kobj) {

-		if (sysfs_mount && sysfs_mount->mnt_sb)

-			parent_sd = sysfs_mount->mnt_sb->s_root->d_fsdata;

-	} else

+	if (!kobj)

+		parent_sd = &...
[ message continues ]

From: Eric W. Biederman <ebiederm@xmission.com>
This is a small cleanup patch that makes the code just

a little bit cleaner.
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>

Signed-off-by: Tejun Heo <htejun@gmail.com>

Cc: Cornelia Huck <cornelia.huck@de.ibm.com>

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---

 fs/sysfs/dir.c |    4 +---

 1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c

index 7f4abe1..b72b42e 100644

--- a/fs/sysfs/dir.c

+++ b/fs/sysfs/dir.c

@@ -756,9 +756,7 @@ static struct dentry * sysfs_lookup(struct inode *dir, struct dentry *dentry,
 	mutex_lock(&sysfs_mutex);
-	for (sd = parent_sd->s_children; sd; sd = sd->s_sibling)

-		if (sysfs_type(sd) && !strcmp(sd->s_name, dentry->d_name.name))

-			break;

+	sd = sysfs_find_dirent(parent_sd, dentry->d_name.name);
 	/* no such entry */

 	if (!sd)

--

1.5.3.4
-

From: Eric W. Biederman <ebiederm@xmission.com>
At some point someone wrote sysfs_readdir to insert a cursor

into the list of sysfs_dirents to ensure that sysfs_readdir would

restart properly.  That works but it is complex code and tends

to be expensive.
The same effect can be achieved by keeping the sysfs_dirents in

inode order and using the inode number as the f_pos.  Then

when we restart we just have to find the first dirent whose inode

number is equal or greater then the last sysfs_dirent we attempted

to return.
Removing the sysfs directory cursor also allows the remove of

all of the mysterious checks for sysfs_type(sd) != 0.   Which

were nonbovious checks to see if a cursor was in a directory list.
tj: offset marker for EOF is changed from UINT_MAX to INT_MAX to avoid

    overflow in case offset is 32bit.
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>

Signed-off-by: Tejun Heo <htejun@gmail.com>

Cc: Cornelia Huck <cornelia.huck@de.ibm.com>

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---

 fs/sysfs/dir.c |  175 ++++++++++++++------------------------------------------

 1 files changed, 44 insertions(+), 131 deletions(-)
diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c

index b72b42e..953e843 100644

--- a/fs/sysfs/dir.c

+++ b/fs/sysfs/dir.c

@@ -33,10 +33,20 @@ static DEFINE_IDA(sysfs_ino_ida);

 static void sysfs_link_sibling(struct sysfs_dirent *sd)

 {

 	struct sysfs_dirent *parent_sd = sd->s_parent;

+	struct sysfs_dirent **pos;
 	BUG_ON(sd->s_sibling);

-	sd->s_sibling = parent_sd->s_children;

-	parent_sd->s_children = sd;

+

+	/* Store directory entries in order by ino.  This allows

+	 * readdir to properly restart without having to add a

+	 * cursor into the s_children list.

+	 */

+	for (pos = &parent_sd->s_children; *pos; pos = &(*pos)->s_sibling) {

+		if (sd->s_ino < (*pos)->s_ino)

+			break;

+	}

+	sd->s_sibling = *pos;

+	*pos = sd;

 }
 /**

@@ -659,7 +669,7 @@ stru...
[ message continues ]

From: Eric W. Biederman <ebiederm@xmission.com>
Currently we find the dentry to drop by looking at sd->s_dentry.

We can just as easily accomplish the same task by looking up the

sysfs inode and finding all of the dentries from there, with the

added bonus that we don't need to play with the sysfs_assoc_lock.
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>

Signed-off-by: Tejun Heo <htejun@gmail.com>

Cc: Cornelia Huck <cornelia.huck@de.ibm.com>

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---

 fs/sysfs/dir.c |   53 ++++++++++++++++++++++++++---------------------------

 1 files changed, 26 insertions(+), 27 deletions(-)
diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c

index 953e843..1af963e 100644

--- a/fs/sysfs/dir.c

+++ b/fs/sysfs/dir.c

@@ -565,50 +565,49 @@ void sysfs_remove_one(struct sysfs_addrm_cxt *acxt, struct sysfs_dirent *sd)

  *	Drop dentry for @sd.  @sd must have been unlinked from its

  *	parent on entry to this function such that it can't be looked

  *	up anymore.

- *

- *	@sd->s_dentry which is protected with sysfs_assoc_lock points

- *	to the currently associated dentry but we're not holding a

- *	reference to it and racing with dput().  Grab dcache_lock and

- *	verify dentry before dropping it.  If @sd->s_dentry is NULL or

- *	dput() beats us, no need to bother.

  */

 static void sysfs_drop_dentry(struct sysfs_dirent *sd)

 {

-	struct dentry *dentry = NULL;

 	struct inode *inode;

+	struct dentry *dentry;

+

+	inode = ilookup(sysfs_sb, sd->s_ino);

+	if (!inode)

+		return;
-	/* We're not holding a reference to ->s_dentry dentry but the

-	 * field will stay valid as long as sysfs_assoc_lock is held.

+	/* Drop any existing dentries associated with sd.

+	 *

+	 * For the dentry to be properly freed we need to grab a

+	 * reference to the dentry under the dcache lock,  unhash it,

+	 * and then put it.  The playing with the dentry count allows

+	 * dput to immediately free the dentry  if it is not in use....
[ message continues ]

From: Eric W. Biederman <ebiederm@xmission.com>
Looking carefully at the rename code we have a subtle dependency

that the structure of sysfs not change while we are performing

a rename.  If the parent directory of the object we are renaming

changes while the rename is being performed nasty things could

happen when we go to release our locks.
So introduce a sysfs_rename_mutex to prevent this highly

unlikely theoretical issue.
In addition hold sysfs_rename_mutex over all calls to

sysfs_get_dentry. Allowing sysfs_get_dentry to be simplified

in the future.
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>

Signed-off-by: Tejun Heo <htejun@gmail.com>

Cc: Cornelia Huck <cornelia.huck@de.ibm.com>

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---

 fs/sysfs/dir.c   |    8 +++++++-

 fs/sysfs/file.c  |    4 ++++

 fs/sysfs/sysfs.h |    1 +

 3 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c

index 1af963e..9fe83d2 100644

--- a/fs/sysfs/dir.c

+++ b/fs/sysfs/dir.c

@@ -15,6 +15,7 @@

 #include "sysfs.h"
 DEFINE_MUTEX(sysfs_mutex);

+DEFINE_MUTEX(sysfs_rename_mutex);

 spinlock_t sysfs_assoc_lock = SPIN_LOCK_UNLOCKED;
 static spinlock_t sysfs_ino_lock = SPIN_LOCK_UNLOCKED;

@@ -82,7 +83,7 @@ static void sysfs_unlink_sibling(struct sysfs_dirent *sd)

  *	down from there looking up dentry for each step.

  *

  *	LOCKING:

- *	Kernel thread context (may sleep)

+ *	mutex_lock(sysfs_rename_mutex)

  *

  *	RETURNS:

  *	Pointer to found dentry on success, ERR_PTR() value on error.

@@ -858,6 +859,8 @@ int sysfs_rename_dir(struct kobject * kobj, const char *new_name)

 	const char *dup_name = NULL;

 	int error;
+	mutex_lock(&sysfs_rename_mutex);

+

 	/* get the original dentry */

 	sd = kobj->sd;

 	old_dentry = sysfs_get_dentry(sd);

@@ -915,6 +918,7 @@ int sysfs_rename_dir(struct kobject * kobj, const char *new_name)

 	kfree(dup_name);

 	dput(old_dentry);

 	dput(new_dentry);

+	mutex_unlock...
[ message continues ]

From: Tejun Heo <htejun@gmail.com>
Now that we know the sysfs tree structure cannot change under us and

sysfs shadow support is dropped, sysfs_get_dentry() can be simplified

greatly.  It can just look up from the root and there's no need to

retry on failure.
Signed-off-by: Tejun Heo <htejun@gmail.com>

Cc: Eric W. Biederman <ebiederm@xmission.com>

Cc: Cornelia Huck <cornelia.huck@de.ibm.com>

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---

 fs/sysfs/dir.c |   91 ++++++++++----------------------------------------------

 1 files changed, 16 insertions(+), 75 deletions(-)
diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c

index 9fe83d2..1c3dc5d 100644

--- a/fs/sysfs/dir.c

+++ b/fs/sysfs/dir.c

@@ -78,9 +78,8 @@ static void sysfs_unlink_sibling(struct sysfs_dirent *sd)

  *	@sd: sysfs_dirent of interest

  *

  *	Get dentry for @sd.  Dentry is looked up if currently not

- *	present.  This function climbs sysfs_dirent tree till it

- *	reaches a sysfs_dirent with valid dentry attached and descends

- *	down from there looking up dentry for each step.

+ *	present.  This function descends from the root looking up

+ *	dentry for each step.

  *

  *	LOCKING:

  *	mutex_lock(sysfs_rename_mutex)

@@ -90,86 +89,28 @@ static void sysfs_unlink_sibling(struct sysfs_dirent *sd)

  */

 struct dentry *sysfs_get_dentry(struct sysfs_dirent *sd)

 {

-	struct sysfs_dirent *cur;

-	struct dentry *parent_dentry, *dentry;

-	int i, depth;

+	struct dentry *dentry = dget(sysfs_sb->s_root);
-	/* Find the first parent which has valid s_dentry and get the

-	 * dentry.

-	 */

-	mutex_lock(&sysfs_mutex);

- restart0:

-	spin_lock(&sysfs_assoc_lock);

- restart1:

-	spin_lock(&dcache_lock);

-

-	dentry = NULL;

-	depth = 0;

-	cur = sd;

-	while (!cur->s_dentry || !cur->s_dentry->d_inode) {

-		if (cur->s_flags & SYSFS_FLAG_REMOVED) {

-			dentry = ERR_PTR(-ENOENT);

-			depth = 0;

-			break;

-		}

-		cur = cur->s_parent;

-		depth++;

-	}

-	if (...
[ message continues ]

From: Eric W. Biederman <ebiederm@xmission.com>
The only uses of s_dentry left are the code that maintains

s_dentry and trivial users that don't actually need it.

So this patch removes the s_dentry maintenance code and

restructures the trivial uses to use something else.
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>

Signed-off-by: Tejun Heo <htejun@gmail.com>

Cc: Cornelia Huck <cornelia.huck@de.ibm.com>

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---

 fs/sysfs/dir.c   |   32 ++++----------------------------

 fs/sysfs/mount.c |    1 -

 fs/sysfs/sysfs.h |    1 -

 3 files changed, 4 insertions(+), 30 deletions(-)
diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c

index 1c3dc5d..36b6c79 100644

--- a/fs/sysfs/dir.c

+++ b/fs/sysfs/dir.c

@@ -289,22 +289,7 @@ static void sysfs_d_iput(struct dentry * dentry, struct inode * inode)

 {

 	struct sysfs_dirent * sd = dentry->d_fsdata;
-	if (sd) {

-		/* sd->s_dentry is protected with sysfs_assoc_lock.

-		 * This allows sysfs_drop_dentry() to dereference it.

-		 */

-		spin_lock(&sysfs_assoc_lock);

-

-		/* The dentry might have been deleted or another

-		 * lookup could have happened updating sd->s_dentry to

-		 * point the new dentry.  Ignore if it isn't pointing

-		 * to this dentry.

-		 */

-		if (sd->s_dentry == dentry)

-			sd->s_dentry = NULL;

-		spin_unlock(&sysfs_assoc_lock);

-		sysfs_put(sd);

-	}

+	sysfs_put(sd);

 	iput(inode);

 }
@@ -352,9 +337,6 @@ struct sysfs_dirent *sysfs_new_dirent(const char *name, umode_t mode, int type)

  *	@sd: target sysfs_dirent

  *	@dentry: dentry to associate

  *

- *	Associate @sd with @dentry.  This is protected by

- *	sysfs_assoc_lock to avoid race with sysfs_d_iput().

- *

  *	LOCKING:

  *	mutex_lock(sysfs_mutex)

  */

@@ -362,12 +344,6 @@ static void sysfs_attach_dentry(struct sysfs_dirent *sd, struct dentry *dentry)

 {

 	dentry->d_op = &sysfs_dentry_ops;

 	dentry->d_fsdata = sysfs_get(sd);

-

-	/* prot...
[ message continues ]

From: Eric W. Biederman <ebiederm@xmission.com>
This patch rewrites sysfs_rename_dir to perform it's checks

as much as possible on the underlying sysfs_dirents instead

of the contents of the dcache.  It turns out that this version

is a little simpler, and a little more like the rest of

the sysfs directory modification code.
tj: fixed double locking of sysfs_mutex
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>

Signed-off-by: Tejun Heo <htejun@gmail.com>

Cc: Cornelia Huck <cornelia.huck@de.ibm.com>

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---

 fs/sysfs/dir.c |   38 ++++++++++++++++----------------------

 1 files changed, 16 insertions(+), 22 deletions(-)
diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c

index 36b6c79..463c5e3 100644

--- a/fs/sysfs/dir.c

+++ b/fs/sysfs/dir.c

@@ -770,7 +770,7 @@ void sysfs_remove_dir(struct kobject * kobj)
 int sysfs_rename_dir(struct kobject * kobj, const char *new_name)

 {

-	struct sysfs_dirent *sd;

+	struct sysfs_dirent *sd = kobj->sd;

 	struct dentry *parent = NULL;

 	struct dentry *old_dentry = NULL, *new_dentry = NULL;

 	const char *dup_name = NULL;

@@ -778,63 +778,57 @@ int sysfs_rename_dir(struct kobject * kobj, const char *new_name)
 	mutex_lock(&sysfs_rename_mutex);
+	error = 0;

+	if (strcmp(sd->s_name, new_name) == 0)

+		goto out;	/* nothing to rename */

+

 	/* get the original dentry */

-	sd = kobj->sd;

 	old_dentry = sysfs_get_dentry(sd);

 	if (IS_ERR(old_dentry)) {

 		error = PTR_ERR(old_dentry);

-		goto out_dput;

+		goto out;

 	}
 	parent = old_dentry->d_parent;
 	/* lock parent and get dentry for new name */

 	mutex_lock(&parent->d_inode->i_mutex);

+	mutex_lock(&sysfs_mutex);
-	new_dentry = lookup_one_len(new_name, parent, strlen(new_name));

-	if (IS_ERR(new_dentry)) {

-		error = PTR_ERR(new_dentry);

-		goto out_unlock;

-	}

-

-	error = -EINVAL;

-	if (old_dentry == new_dentry)

+	error = -EEXIST;

+	if (sysfs_find_diren...
[ message continues ]

From: Eric W. Biederman <ebiederm@xmission.com>
This patch rewrites sysfs_move_dir to perform it's checks

as much as possible on the underlying sysfs_dirents instead

of the contents of the dcache, making sysfs_move_dir

more like the rest of the sysfs directory modification

code.
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>

Signed-off-by: Tejun Heo <htejun@gmail.com>

Cc: Cornelia Huck <cornelia.huck@de.ibm.com>

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---

 fs/sysfs/dir.c |   34 ++++++++++++++++++----------------

 1 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c

index 463c5e3..da4bb66 100644

--- a/fs/sysfs/dir.c

+++ b/fs/sysfs/dir.c

@@ -845,56 +845,58 @@ int sysfs_move_dir(struct kobject *kobj, struct kobject *new_parent_kobj)

 	BUG_ON(!sd->s_parent);

 	new_parent_sd = new_parent_kobj->sd ? new_parent_kobj->sd : &sysfs_root;
+	error = 0;

+	if (sd->s_parent == new_parent_sd)

+		goto out;	/* nothing to move */

+

 	/* get dentries */

 	old_dentry = sysfs_get_dentry(sd);

 	if (IS_ERR(old_dentry)) {

 		error = PTR_ERR(old_dentry);

-		goto out_dput;

+		goto out;

 	}

 	old_parent = old_dentry->d_parent;
 	new_parent = sysfs_get_dentry(new_parent_sd);

 	if (IS_ERR(new_parent)) {

 		error = PTR_ERR(new_parent);

-		goto out_dput;

+		goto out;

 	}
-	if (old_parent->d_inode == new_parent->d_inode) {

-		error = 0;

-		goto out_dput;	/* nothing to move */

-	}

 again:

 	mutex_lock(&old_parent->d_inode->i_mutex);

 	if (!mutex_trylock(&new_parent->d_inode->i_mutex)) {

 		mutex_unlock(&old_parent->d_inode->i_mutex);

 		goto again;

 	}

+	mutex_lock(&sysfs_mutex);
-	new_dentry = lookup_one_len(kobject_name(kobj), new_parent, strlen(kobject_name(kobj)));

-	if (IS_ERR(new_dentry)) {

-		error = PTR_ERR(new_dentry);

+	error = -EEXIST;

+	if (sysfs_find_dirent(new_parent_sd, sd->s_name))

 		goto out_unlock;

-	} ...
[ message continues ]

From: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---

 Documentation/kernel-parameters.txt |    4 ++++

 drivers/char/pty.c                  |    9 +++++++--

 include/linux/tty.h                 |    1 -

 3 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt

index a57c1f2..bdddd3c 100644

--- a/Documentation/kernel-parameters.txt

+++ b/Documentation/kernel-parameters.txt

@@ -1430,6 +1430,10 @@ and is between 256 and 4096 characters. It is defined in the file

 	pt.		[PARIDE]

 			See Documentation/paride.txt.
+	pty.legacy_count=

+			[KNL] Number of legacy pty's. Overwrites compiled-in

+			default number.

+

 	quiet		[KNL] Disable most log messages
 	r128=		[HW,DRM]

diff --git a/drivers/char/pty.c b/drivers/char/pty.c

index de14aea..73de771 100644

--- a/drivers/char/pty.c

+++ b/drivers/char/pty.c

@@ -248,14 +248,19 @@ static int pty_bsd_ioctl(struct tty_struct *tty, struct file *file,

 	return -ENOIOCTLCMD;

 }
+static int legacy_count = CONFIG_LEGACY_PTY_COUNT;

+module_param(legacy_count, int, 0);

+

 static void __init legacy_pty_init(void)

 {

+	if (legacy_count <= 0)

+		return;
-	pty_driver = alloc_tty_driver(NR_PTYS);

+	pty_driver = alloc_tty_driver(legacy_count);

 	if (!pty_driver)

 		panic("Couldn't allocate pty driver");
-	pty_slave_driver = alloc_tty_driver(NR_PTYS);

+	pty_slave_driver = alloc_tty_driver(legacy_count);

 	if (!pty_slave_driver)

 		panic("Couldn't allocate pty slave driver");
diff --git a/include/linux/tty.h b/include/linux/tty.h

index 6570719..60478f6 100644

--- a/include/linux/tty.h

+++ b/include/linux/tty.h

@@ -21,7 +21,6 @@

  * (Note: the *_driver.minor_start values 1, 64, 128, 192 are

  * hardcoded at present.)

  */

-#define NR_PTYS	CONFIG_LEGACY_PTY_COUNT   /* Number of legacy ptys */

 #define NR_UNIX98_PTY_DEFAULT	4096      /*...
[ message continues ]

We want to let people know when we create a duplicate sysfs file, as

they need to fix up their code.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---

 fs/sysfs/dir.c |    6 +++++-

 1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c

index da4bb66..5d95aa8 100644

--- a/fs/sysfs/dir.c

+++ b/fs/sysfs/dir.c

@@ -428,8 +428,12 @@ void sysfs_addrm_start(struct sysfs_addrm_cxt *acxt,

  */

 int sysfs_add_one(struct sysfs_addrm_cxt *acxt, struct sysfs_dirent *sd)

 {

-	if (sysfs_find_dirent(acxt->parent_sd, sd->s_name))

+	if (sysfs_find_dirent(acxt->parent_sd, sd->s_name)) {

+		printk(KERN_WARNING "sysfs: duplicate filename '%s' "

+		       "can not be created\n", sd->s_name);

+		WARN_ON(1);

 		return -EEXIST;

+	}
 	sd->s_parent = sysfs_get(acxt->parent_sd);
--

1.5.3.4
-

From: Tejun Heo <htejun@gmail.com>
sysfs_add/remove_one() now link and unlink the target dirent into and

from the children list.  Update comments accordingly.
Signed-off-by: Tejun Heo <htejun@gmail.com>

Acked-by: Cornelia Huck <cornelia.huck@de.ibm.com>

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---

 fs/sysfs/dir.c |   10 +++-------

 1 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c

index 5d95aa8..fc615ee 100644

--- a/fs/sysfs/dir.c

+++ b/fs/sysfs/dir.c

@@ -410,10 +410,8 @@ void sysfs_addrm_start(struct sysfs_addrm_cxt *acxt,

  *	@sd: sysfs_dirent to be added

  *

  *	Get @acxt->parent_sd and set sd->s_parent to it and increment

- *	nlink of parent inode if @sd is a directory.  @sd is NOT

- *	linked into the children list of the parent.  The caller

- *	should invoke sysfs_link_sibling() after this function

- *	completes if @sd needs to be on the children list.

+ *	nlink of parent inode if @sd is a directory and link into the

+ *	children list of the parent.

  *

  *	This function should be called between calls to

  *	sysfs_addrm_start() and sysfs_addrm_finish() and should be

@@ -453,9 +451,7 @@ int sysfs_add_one(struct sysfs_addrm_cxt *acxt, struct sysfs_dirent *sd)

  *	@sd: sysfs_dirent to be added

  *

  *	Mark @sd removed and drop nlink of parent inode if @sd is a

- *	directory.  @sd is NOT unlinked from the children list of the

- *	parent.  The caller is repsonsible for removing @sd from the

- *	children list before calling this function.

+ *	directory.  @sd is unlinked from the children list.

  *

  *	This function should be called between calls to

  *	sysfs_addrm_start() and sysfs_addrm_finish() and should be

--

1.5.3.4
-

From: Tejun Heo <htejun@gmail.com>
sysfs_chmod_file() looked and updated only inode of the target file.

Dentry and inode are reclaimable and the update mode data will go away

when the inode is reclaimed.  This patch makes sysfs_chmod_file()

update sd->s_mode too such that the change is permanent.
Signed-off-by: Tejun Heo <htejun@gmail.com>

Acked-by: Cornelia Huck <cornelia.huck@de.ibm.com>

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---

 fs/sysfs/file.c |    9 +++++++++

 1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c

index ff93c92..9fdf8da 100644

--- a/fs/sysfs/file.c

+++ b/fs/sysfs/file.c

@@ -521,10 +521,19 @@ int sysfs_chmod_file(struct kobject *kobj, struct attribute *attr, mode_t mode)

 	}
 	inode = victim->d_inode;

+

 	mutex_lock(&inode->i_mutex);

+

 	newattrs.ia_mode = (mode & S_IALLUGO) | (inode->i_mode & ~S_IALLUGO);

 	newattrs.ia_valid = ATTR_MODE | ATTR_CTIME;

 	rc = notify_change(victim, &newattrs);

+

+	if (rc == 0) {

+		mutex_lock(&sysfs_mutex);

+		victim_sd->s_mode = newattrs.ia_mode;

+		mutex_unlock(&sysfs_mutex);

+	}

+

 	mutex_unlock(&inode->i_mutex);

  out:

 	dput(victim);

--

1.5.3.4
-

From: Tejun Heo <htejun@gmail.com>
sysfs is about to go through major overhaul making this a pretty good

opportunity to clean up (out-of-tree changes and pending patches will

need regeneration anyway).  Clean up headers.
* Kill space between * and symbolname.
* Move SYSFS_* type constants and flags into fs/sysfs/sysfs.h.

  They're internal to sysfs.
* Reformat function prototypes and add argument symbol names.
* Make dummy function definition order match that of function

  prototypes.
* Add some comments.
* Reorganize fs/sysfs/sysfs.h according to which file the declared

  variable or feature lives in.
This patch does not introduce any behavior change.
Signed-off-by: Tejun Heo <htejun@gmail.com>

Acked-by: Cornelia Huck <cornelia.huck@de.ibm.com>

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---

 fs/sysfs/sysfs.h      |  148 ++++++++++++++++++++++++++++++------------------

 include/linux/sysfs.h |  127 +++++++++++++++++++-----------------------

 2 files changed, 149 insertions(+), 126 deletions(-)
diff --git a/fs/sysfs/sysfs.h b/fs/sysfs/sysfs.h

index 791b3ed..63adbec 100644

--- a/fs/sysfs/sysfs.h

+++ b/fs/sysfs/sysfs.h

@@ -1,20 +1,24 @@

+/* type-specific structures for sysfs_dirent->s_* union members */

 struct sysfs_elem_dir {

-	struct kobject		* kobj;

+	struct kobject		*kobj;

 };
 struct sysfs_elem_symlink {

-	struct sysfs_dirent	* target_sd;

+	struct sysfs_dirent	*target_sd;

 };
 struct sysfs_elem_attr {

-	struct attribute	* attr;

+	struct attribute	*attr;

 };
 struct sysfs_elem_bin_attr {

-	struct bin_attribute	* bin_attr;

+	struct bin_attribute	*bin_attr;

 };
 /*

+ * sysfs_dirent - the building block of sysfs hierarchy.  Each and

+ * every sysfs node is represented by single sysfs_dirent.

+ *

  * As long as s_count reference is held, the sysfs_dirent itself is

  * accessible.  Dereferencing s_elem or any other outer entity

  * requires s_active reference.

@@ -22,10 +26,10 @@ struct sysfs_elem_bin...
[ message continues ]

From: Tejun Heo <htejun@gmail.com>
sysfs_update_file() depends on inode->i_mtime but sysfs iondes are now

reclaimable making the reported modification time unreliable.  There's

only one user (pci hotplug) of this notification mechanism and it

reportedly isn't utilized from userland.
Kill sysfs_update_file().
Signed-off-by: Tejun Heo <htejun@gmail.com>

Acked-by: Cornelia Huck <cornelia.huck@de.ibm.com>

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---

 drivers/pci/hotplug/pci_hotplug_core.c |   60 --------------------------------

 fs/sysfs/file.c                        |   40 ---------------------

 include/linux/sysfs.h                  |    7 ----

 3 files changed, 0 insertions(+), 107 deletions(-)
diff --git a/drivers/pci/hotplug/pci_hotplug_core.c b/drivers/pci/hotplug/pci_hotplug_core.c

index bd433ef..f0eba53 100644

--- a/drivers/pci/hotplug/pci_hotplug_core.c

+++ b/drivers/pci/hotplug/pci_hotplug_core.c

@@ -694,66 +694,6 @@ int __must_check pci_hp_change_slot_info(struct hotplug_slot *slot,

 	if ((slot == NULL) || (info == NULL))

 		return -ENODEV;
-	/*

-	* check all fields in the info structure, and update timestamps

-	* for the files referring to the fields that have now changed.

-	*/

-	if ((has_power_file(slot) == 0) &&

-	    (slot->info->power_status != info->power_status)) {

-		retval = sysfs_update_file(&slot->kobj,

-					   &hotplug_slot_attr_power.attr);

-		if (retval)

-			return retval;

-	}

-

-	if ((has_attention_file(slot) == 0) &&

-	    (slot->info->attention_status != info->attention_status)) {

-		retval = sysfs_update_file(&slot->kobj,

-					   &hotplug_slot_attr_attention.attr);

-		if (retval)

-			return retval;

-	}

-

-	if ((has_latch_file(slot) == 0) &&

-	    (slot->info->latch_status != info->latch_status)) {

-		retval = sysfs_update_file(&slot->kobj,

-					   &hotplug_slot_attr_latch.attr);

-		if (retval)

-			return retval...
[ message continues ]

From: Tejun Heo <htejun@gmail.com>
Move s_mode downward such that it's side-by-side with s_iattr which is

used for the same thing.
Signed-off-by: Tejun Heo <htejun@gmail.com>

Acked-by: Cornelia Huck <cornelia.huck@de.ibm.com>

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---

 fs/sysfs/sysfs.h |    2 +-

 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/fs/sysfs/sysfs.h b/fs/sysfs/sysfs.h

index 63adbec..6cf61c8 100644

--- a/fs/sysfs/sysfs.h

+++ b/fs/sysfs/sysfs.h

@@ -39,8 +39,8 @@ struct sysfs_dirent {

 	}			s_elem;
 	unsigned int		s_flags;

-	umode_t			s_mode;

 	ino_t			s_ino;

+	umode_t			s_mode;

 	struct iattr		*s_iattr;

 	atomic_t		s_event;

 };

--

1.5.3.4
-

From: Tejun Heo <htejun@gmail.com>
There's no reason to get an extra reference to sysfs_dirent for an

open file.  Open file has a reference to the dentry which in turn has

a reference to sysfs_dirent.  This is fairly obvious as otherwise open

itself won't be able to access the sysfs_dirent.  Kill the extra

sysfs_get() and matching sysfs_put().
Signed-off-by: Tejun Heo <htejun@gmail.com>

Acked-by: Cornelia Huck <cornelia.huck@de.ibm.com>

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---

 fs/sysfs/bin.c  |    4 +---

 fs/sysfs/file.c |    6 +-----

 2 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/fs/sysfs/bin.c b/fs/sysfs/bin.c

index a819a7e..e93fe5e 100644

--- a/fs/sysfs/bin.c

+++ b/fs/sysfs/bin.c

@@ -193,9 +193,8 @@ static int open(struct inode * inode, struct file * file)

 	mutex_init(&bb->mutex);

 	file->private_data = bb;
-	/* open succeeded, put active reference and pin attr_sd */

+	/* open succeeded, put active reference */

 	sysfs_put_active(attr_sd);

-	sysfs_get(attr_sd);

 	return 0;
  err_out:

@@ -211,7 +210,6 @@ static int release(struct inode * inode, struct file * file)
 	if (bb->mmapped)

 		sysfs_put_active_two(attr_sd);

-	sysfs_put(attr_sd);

 	kfree(bb->buffer);

 	kfree(bb);

 	return 0;

diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c

index 61a8c19..73333dc 100644

--- a/fs/sysfs/file.c

+++ b/fs/sysfs/file.c

@@ -298,9 +298,8 @@ static int sysfs_open_file(struct inode *inode, struct file *file)

 	buffer->ops = ops;

 	file->private_data = buffer;
-	/* open succeeded, put active references and pin attr_sd */

+	/* open succeeded, put active references */

 	sysfs_put_active_two(attr_sd);

-	sysfs_get(attr_sd);

 	return 0;
  err_out:

@@ -310,11 +309,8 @@ static int sysfs_open_file(struct inode *inode, struct file *file)
 static int sysfs_release(struct inode * inode, struct file * filp)

 {

-	struct sysfs_dirent *attr_sd = filp->f_path.dentry->d_fsdata;

 	struct sysfs_bu...
[ message continues ]

From: Tejun Heo <htejun@gmail.com>
In sysfs_release(), sysfs_buffer pointed to by filp->private_data is

guaranteed to exist.  Kill the unnecessary NULL check.  This also

makes the code more consistent with the counterpart in fs/sysfs/bin.c.
Signed-off-by: Tejun Heo <htejun@gmail.com>

Acked-by: Cornelia Huck <cornelia.huck@de.ibm.com>

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---

 fs/sysfs/file.c |    9 ++++-----

 1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c

index 73333dc..8f1ebd8 100644

--- a/fs/sysfs/file.c

+++ b/fs/sysfs/file.c

@@ -311,11 +311,10 @@ static int sysfs_release(struct inode * inode, struct file * filp)

 {

 	struct sysfs_buffer *buffer = filp->private_data;
-	if (buffer) {

-		if (buffer->page)

-			free_page((unsigned long)buffer->page);

-		kfree(buffer);

-	}

+	if (buffer->page)

+		free_page((unsigned long)buffer->page);

+	kfree(buffer);

+

 	return 0;

 }
--

1.5.3.4
-

From: Tejun Heo <htejun@gmail.com>
All bin attr operations require active references of itself and its

parent.  There's no reason to allow open when its parent has been

deactivated and allowing it is inconsistent with regular sysfs file.

Use sysfs_get_active_two() in bin attribute open function.
Signed-off-by: Tejun Heo <htejun@gmail.com>

Acked-by: Cornelia Huck <cornelia.huck@de.ibm.com>

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---

 fs/sysfs/bin.c |   10 +++++-----

 1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/fs/sysfs/bin.c b/fs/sysfs/bin.c

index e93fe5e..9c8f882 100644

--- a/fs/sysfs/bin.c

+++ b/fs/sysfs/bin.c

@@ -171,8 +171,8 @@ static int open(struct inode * inode, struct file * file)

 	struct bin_buffer *bb = NULL;

 	int error;
-	/* need attr_sd for attr */

-	if (!sysfs_get_active(attr_sd))

+	/* binary file operations requires both @sd and its parent */

+	if (!sysfs_get_active_two(attr_sd))

 		return -ENODEV;
 	error = -EACCES;

@@ -193,12 +193,12 @@ static int open(struct inode * inode, struct file * file)

 	mutex_init(&bb->mutex);

 	file->private_data = bb;
-	/* open succeeded, put active reference */

-	sysfs_put_active(attr_sd);

+	/* open succeeded, put active references */

+	sysfs_put_active_two(attr_sd);

 	return 0;
  err_out:

-	sysfs_put_active(attr_sd);

+	sysfs_put_active_two(attr_sd);

 	kfree(bb);

 	return error;

 }

--

1.5.3.4
-

From: Tejun Heo <htejun@gmail.com>
Make s_elem an anonymous union.  Prefixing with s_elem makes things

needlessly longer without any advantage.
Signed-off-by: Tejun Heo <htejun@gmail.com>

Acked-by: Cornelia Huck <cornelia.huck@de.ibm.com>

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---

 fs/sysfs/bin.c     |   14 +++++++-------

 fs/sysfs/dir.c     |    4 ++--

 fs/sysfs/file.c    |   14 +++++++-------

 fs/sysfs/inode.c   |    2 +-

 fs/sysfs/symlink.c |    4 ++--

 fs/sysfs/sysfs.h   |   10 +++++-----

 6 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/fs/sysfs/bin.c b/fs/sysfs/bin.c

index 9c8f882..247ea19 100644

--- a/fs/sysfs/bin.c

+++ b/fs/sysfs/bin.c

@@ -30,8 +30,8 @@ static int

 fill_read(struct dentry *dentry, char *buffer, loff_t off, size_t count)

 {

 	struct sysfs_dirent *attr_sd = dentry->d_fsdata;

-	struct bin_attribute *attr = attr_sd->s_elem.bin_attr.bin_attr;

-	struct kobject *kobj = attr_sd->s_parent->s_elem.dir.kobj;

+	struct bin_attribute *attr = attr_sd->s_bin_attr.bin_attr;

+	struct kobject *kobj = attr_sd->s_parent->s_dir.kobj;

 	int rc;
 	/* need attr_sd for attr, its parent for kobj */

@@ -87,8 +87,8 @@ static int

 flush_write(struct dentry *dentry, char *buffer, loff_t offset, size_t count)

 {

 	struct sysfs_dirent *attr_sd = dentry->d_fsdata;

-	struct bin_attribute *attr = attr_sd->s_elem.bin_attr.bin_attr;

-	struct kobject *kobj = attr_sd->s_parent->s_elem.dir.kobj;

+	struct bin_attribute *attr = attr_sd->s_bin_attr.bin_attr;

+	struct kobject *kobj = attr_sd->s_parent->s_dir.kobj;

 	int rc;
 	/* need attr_sd for attr, its parent for kobj */

@@ -140,8 +140,8 @@ static int mmap(struct file *file, struct vm_area_struct *vma)

 {

 	struct bin_buffer *bb = file->private_data;

 	struct sysfs_dirent *attr_sd = file->f_path.dentry->d_fsdata;

-	struct bin_attribute *attr = attr_sd->s_elem.bin_attr.bin_attr;

-	struct kobject *kobj = attr_sd->s_parent...
[ message continues ]

From: Tejun Heo <htejun@gmail.com>
sysfs_attach_dentry() now has only one caller and isn't doing much

other than obfuscating the code.  Open code and kill it.
Signed-off-by: Tejun Heo <htejun@gmail.com>

Acked-by: Cornelia Huck <cornelia.huck@de.ibm.com>

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---

 fs/sysfs/dir.c |   20 ++++----------------

 1 files changed, 4 insertions(+), 16 deletions(-)
diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c

index 6ee76a8..48a3ed4 100644

--- a/fs/sysfs/dir.c

+++ b/fs/sysfs/dir.c

@@ -332,21 +332,6 @@ struct sysfs_dirent *sysfs_new_dirent(const char *name, umode_t mode, int type)

 	return NULL;

 }
-/**

- *	sysfs_attach_dentry - associate sysfs_dirent with dentry

- *	@sd: target sysfs_dirent

- *	@dentry: dentry to associate

- *

- *	LOCKING:

- *	mutex_lock(sysfs_mutex)

- */

-static void sysfs_attach_dentry(struct sysfs_dirent *sd, struct dentry *dentry)

-{

-	dentry->d_op = &sysfs_dentry_ops;

-	dentry->d_fsdata = sysfs_get(sd);

-	d_rehash(dentry);

-}

-

 static int sysfs_ilookup_test(struct inode *inode, void *arg)

 {

 	struct sysfs_dirent *sd = arg;

@@ -696,8 +681,11 @@ static struct dentry * sysfs_lookup(struct inode *dir, struct dentry *dentry,

 		goto out_unlock;

 	}
+	/* instantiate and hash dentry */

+	dentry->d_op = &sysfs_dentry_ops;

+	dentry->d_fsdata = sysfs_get(sd);

 	d_instantiate(dentry, inode);

-	sysfs_attach_dentry(sd, dentry);

+	d_rehash(dentry);
  out_unlock:

 	mutex_unlock(&sysfs_mutex);

--

1.5.3.4
-

From: Tejun Heo <htejun@gmail.com>
sysfs_root is different from a regular directory dirent in that it's

of type SYSFS_ROOT and doesn't have a name.  These differences aren't

used by anybody and only adds to complexity.  Make sysfs_root a

regular directory dirent.
Signed-off-by: Tejun Heo <htejun@gmail.com>

Acked-by: Cornelia Huck <cornelia.huck@de.ibm.com>

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---

 fs/sysfs/inode.c |    5 -----

 fs/sysfs/mount.c |    3 ++-

 fs/sysfs/sysfs.h |    9 ++++-----

 3 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/fs/sysfs/inode.c b/fs/sysfs/inode.c

index b6ac4e6..c40fb9f 100644

--- a/fs/sysfs/inode.c

+++ b/fs/sysfs/inode.c

@@ -157,11 +157,6 @@ static void sysfs_init_inode(struct sysfs_dirent *sd, struct inode *inode)
 	/* initialize inode according to type */

 	switch (sysfs_type(sd)) {

-	case SYSFS_ROOT:

-		inode->i_op = &sysfs_dir_inode_operations;

-		inode->i_fop = &sysfs_dir_operations;

-		inc_nlink(inode); /* directory, account for "." */

-		break;

 	case SYSFS_DIR:

 		inode->i_op = &sysfs_dir_inode_operations;

 		inode->i_fop = &sysfs_dir_operations;

diff --git a/fs/sysfs/mount.c b/fs/sysfs/mount.c

index 28bf359..465902c 100644

--- a/fs/sysfs/mount.c

+++ b/fs/sysfs/mount.c

@@ -24,8 +24,9 @@ static const struct super_operations sysfs_ops = {

 };
 struct sysfs_dirent sysfs_root = {

+	.s_name		= "",

 	.s_count	= ATOMIC_INIT(1),

-	.s_flags	= SYSFS_ROOT,

+	.s_flags	= SYSFS_DIR,

 	.s_mode		= S_IFDIR | S_IRWXU | S_IRUGO | S_IXUGO,

 	.s_ino		= 1,

 };

diff --git a/fs/sysfs/sysfs.h b/fs/sysfs/sysfs.h

index 2a68bfa..60405a6 100644

--- a/fs/sysfs/sysfs.h

+++ b/fs/sysfs/sysfs.h

@@ -48,11 +48,10 @@ struct sysfs_dirent {

 #define SD_DEACTIVATED_BIAS		INT_MIN
 #define SYSFS_TYPE_MASK			0x00ff

-#define SYSFS_ROOT			0x0001

-#define SYSFS_DIR			0x0002

-#define SYSFS_KOBJ_ATTR			0x0004

-#define SYSFS_KOBJ_BIN_ATTR		0x0008

-#define SYSFS_KOBJ_LINK			0x0020

...
[ message continues ]

From: Tejun Heo <htejun@gmail.com>
Children list head is only meaninful for directory nodes.  Move it

into s_dir.  This doesn't save any space currently but it will with

further changes.
Signed-off-by: Tejun Heo <htejun@gmail.com>

Acked-by: Cornelia Huck <cornelia.huck@de.ibm.com>

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---

 fs/sysfs/dir.c   |   17 +++++++++--------

 fs/sysfs/inode.c |    2 +-

 fs/sysfs/sysfs.h |    3 ++-

 3 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c

index 48a3ed4..4ad9422 100644

--- a/fs/sysfs/dir.c

+++ b/fs/sysfs/dir.c

@@ -26,7 +26,7 @@ static DEFINE_IDA(sysfs_ino_ida);

  *	@sd: sysfs_dirent of interest

  *

  *	Link @sd into its sibling list which starts from

- *	sd->s_parent->s_children.

+ *	sd->s_parent->s_dir.children.

  *

  *	Locking:

  *	mutex_lock(sysfs_mutex)

@@ -40,9 +40,9 @@ static void sysfs_link_sibling(struct sysfs_dirent *sd)
 	/* Store directory entries in order by ino.  This allows

 	 * readdir to properly restart without having to add a

-	 * cursor into the s_children list.

+	 * cursor into the s_dir.children list.

 	 */

-	for (pos = &parent_sd->s_children; *pos; pos = &(*pos)->s_sibling) {

+	for (pos = &parent_sd->s_dir.children; *pos; pos = &(*pos)->s_sibling) {

 		if (sd->s_ino < (*pos)->s_ino)

 			break;

 	}

@@ -55,7 +55,7 @@ static void sysfs_link_sibling(struct sysfs_dirent *sd)

  *	@sd: sysfs_dirent of interest

  *

  *	Unlink @sd from its sibling list which starts from

- *	sd->s_parent->s_children.

+ *	sd->s_parent->s_dir.children.

  *

  *	Locking:

  *	mutex_lock(sysfs_mutex)

@@ -64,7 +64,8 @@ static void sysfs_unlink_sibling(struct sysfs_dirent *sd)

 {

 	struct sysfs_dirent **pos;
-	for (pos = &sd->s_parent->s_children; *pos; pos = &(*pos)->s_sibling) {

+	for (pos = &sd->s_parent->s_dir.children; *pos;

+	     pos = &(*pos)->s_siblin...
[ message continues ]

From: Tejun Heo <htejun@gmail.com>
Implement sysfs_open_dirent which represents an open file (attribute)

sysfs_dirent.  A file sysfs_dirent with one or more open files have

one sysfs_dirent and all sysfs_buffers (one for each open instance)

are linked to it.
sysfs_open_dirent doesn't actually do anything yet but will be used to

off-load things which are specific for open file sysfs_dirent from it.
Signed-off-by: Tejun Heo <htejun@gmail.com>

Acked-by: Cornelia Huck <cornelia.huck@de.ibm.com>

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---

 fs/sysfs/file.c  |  109 +++++++++++++++++++++++++++++++++++++++++++++++++++++-

 fs/sysfs/sysfs.h |    3 +

 2 files changed, 111 insertions(+), 1 deletions(-)
diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c

index 3c91a57..b13ba94 100644

--- a/fs/sysfs/file.c

+++ b/fs/sysfs/file.c

@@ -49,6 +49,22 @@ static struct sysfs_ops subsys_sysfs_ops = {

 	.store	= subsys_attr_store,

 };
+/*

+ * There's one sysfs_buffer for each open file and one

+ * sysfs_open_dirent for each sysfs_dirent with one or more open

+ * files.

+ *

+ * filp->private_data points to sysfs_buffer and

+ * sysfs_dirent->s_attr.open points to sysfs_open_dirent.  s_attr.open

+ * is protected by sysfs_open_dirent_lock.

+ */

+static spinlock_t sysfs_open_dirent_lock = SPIN_LOCK_UNLOCKED;

+

+struct sysfs_open_dirent {

+	atomic_t		refcnt;

+	struct list_head	buffers; /* goes through sysfs_buffer.list */

+};

+

 struct sysfs_buffer {

 	size_t			count;

 	loff_t			pos;

@@ -57,6 +73,7 @@ struct sysfs_buffer {

 	struct mutex		mutex;

 	int			needs_read_fill;

 	int			event;

+	struct list_head	list;

 };
 /**

@@ -237,6 +254,86 @@ sysfs_write_file(struct file *file, const char __user *buf, size_t count, loff_t

 	return len;

 }
+/**

+ *	sysfs_get_open_dirent - get or create sysfs_open_dirent

+ *	@sd: target sysfs_dirent

+ *	@buffer: sysfs_buffer for this instance of open

+ *

+ *	If @sd->s_attr.open exists, increment its referenc...
[ message continues ]

From: Tejun Heo <htejun@gmail.com>
Sysfs file poll implementation is scattered over sysfs and kobject.

Event numbering is done in sysfs_dirent but wait itself is done on

kobject.  This not only unecessarily bloats both kobject and

sysfs_dirent but is also buggy - if a sysfs_dirent is removed while

there still are pollers, the associaton betwen the kobject and

sysfs_dirent breaks and kobject may be freed with the pollers still

sleeping on it.
This patch moves whole poll implementation into sysfs_open_dirent.

Each time a sysfs_open_dirent is created, event number restarts from 1

and pollers sleep on sysfs_open_dirent.  As event sequence number is

meaningless without any open file and pollers should have open file

and thus sysfs_open_dirent, this ephemeral event counting works and is

a saner implementation.
This patch fixes the dnagling sleepers bug and reduces the sizes of

kobject and sysfs_dirent by one pointer.
Signed-off-by: Tejun Heo <htejun@gmail.com>

Acked-by: Cornelia Huck <cornelia.huck@de.ibm.com>

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---

 fs/sysfs/dir.c          |    1 -

 fs/sysfs/file.c         |   25 +++++++++++++++++++------

 fs/sysfs/sysfs.h        |    1 -

 include/linux/kobject.h |    1 -

 lib/kobject.c           |    1 -

 5 files changed, 19 insertions(+), 10 deletions(-)
diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c

index 4ad9422..e301a12 100644

--- a/fs/sysfs/dir.c

+++ b/fs/sysfs/dir.c

@@ -318,7 +318,6 @@ struct sysfs_dirent *sysfs_new_dirent(const char *name, umode_t mode, int type)
 	atomic_set(&sd->s_count, 1);

 	atomic_set(&sd->s_active, 0);

-	atomic_set(&sd->s_event, 1);
 	sd->s_name = name;

 	sd->s_mode = mode;

diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c

index b13ba94..c05f961 100644

--- a/fs/sysfs/file.c

+++ b/fs/sysfs/file.c

@@ -62,6 +62,8 @@ static spinlock_t sysfs_open_dirent_lock = SPIN_LOCK_UNLOCKED;
 struct sysfs_open_dirent {

 	atomic_t		refcnt;

+	atomic_t	...
[ message continues ]

There is only one user of it, and it is only a wrapper for kset_init().
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---

 Documentation/kobject.txt |    1 -

 drivers/base/class.c      |    2 +-

 include/linux/kobject.h   |    1 -

 lib/kobject.c             |    5 -----

 4 files changed, 1 insertions(+), 8 deletions(-)
diff --git a/Documentation/kobject.txt b/Documentation/kobject.txt

index 5e7aca2..ca86a88 100644

--- a/Documentation/kobject.txt

+++ b/Documentation/kobject.txt

@@ -238,7 +238,6 @@ kobj_set_kset_s(obj,subsys)

 - Assumes that obj->kobj exists, and is a struct kobject.

 - Sets the kset of that kobject to the kset <subsys>.
-void subsystem_init(struct kset *s);

 int subsystem_register(struct kset *s);

 void subsystem_unregister(struct kset *s);
diff --git a/drivers/base/class.c b/drivers/base/class.c

index 3e9b04c..5b9cf06 100644

--- a/drivers/base/class.c

+++ b/drivers/base/class.c

@@ -861,7 +861,7 @@ int __init classes_init(void)
 	/* ick, this is ugly, the things we go through to keep from showing up

 	 * in sysfs... */

-	subsystem_init(&class_obj_subsys);

+	kset_init(&class_obj_subsys);

 	if (!class_obj_subsys.kobj.parent)

 		class_obj_subsys.kobj.parent = &class_obj_subsys.kobj;

 	return 0;

diff --git a/include/linux/kobject.h b/include/linux/kobject.h

index a8a84fc..05cc5b2 100644

--- a/include/linux/kobject.h

+++ b/include/linux/kobject.h

@@ -217,7 +217,6 @@ extern struct kset hypervisor_subsys;

 #define kobj_set_kset_s(obj,subsys) \

 	(obj)->kobj.kset = &(subsys)
-extern void subsystem_init(struct kset *);

 extern int __must_check subsystem_register(struct kset *);

 extern void subsystem_unregister(struct kset *);
diff --git a/lib/kobject.c b/lib/kobject.c

index fc6db6b..b7e0646 100644

--- a/lib/kobject.c

+++ b/lib/kobject.c

@@ -617,11 +617,6 @@ struct kobject * kset_find_obj(struct kset * kset, const char * name)

 	return ret;

 }
-void subsystem_init(struct kset *s)

-{

-	kset_init(s);...
[ message continues ]

This makes it a bit more sane when trying to figure out how to clean up

the ktype mess.
Based on a larger patch from Kay Sievers
Cc: Kay Sievers <kay.sievers@vrfy.org>

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---

 drivers/base/class.c |   10 +++++-----

 1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/base/class.c b/drivers/base/class.c

index 5b9cf06..a863bb0 100644

--- a/drivers/base/class.c

+++ b/drivers/base/class.c

@@ -65,13 +65,13 @@ static struct sysfs_ops class_sysfs_ops = {

 	.store	= class_attr_store,

 };
-static struct kobj_type ktype_class = {

+static struct kobj_type class_ktype = {

 	.sysfs_ops	= &class_sysfs_ops,

 	.release	= class_release,

 };
 /* Hotplug events for classes go to the class_obj subsys */

-static decl_subsys(class, &ktype_class, NULL);

+static decl_subsys(class, &class_ktype, NULL);
 int class_create_file(struct class * cls, const struct class_attribute * attr)

@@ -323,7 +323,7 @@ static void class_dev_release(struct kobject * kobj)

 	}

 }
-static struct kobj_type ktype_class_device = {

+static struct kobj_type class_device_ktype = {

 	.sysfs_ops	= &class_dev_sysfs_ops,

 	.release	= class_dev_release,

 };

@@ -332,7 +332,7 @@ static int class_uevent_filter(struct kset *kset, struct kobject *kobj)

 {

 	struct kobj_type *ktype = get_ktype(kobj);
-	if (ktype == &ktype_class_device) {

+	if (ktype == &class_device_ktype) {

 		struct class_device *class_dev = to_class_dev(kobj);

 		if (class_dev->class)

 			return 1;

@@ -452,7 +452,7 @@ static struct kset_uevent_ops class_uevent_ops = {

 	.uevent =	class_uevent,

 };
-static decl_subsys(class_obj, &ktype_class_device, &class_uevent_ops);

+static decl_subsys(class_obj, &class_device_ktype, &class_uevent_ops);
 static int class_device_add_attrs(struct class_device * cd)

--

1.5.3.4
-

This makes it a bit more sane when trying to figure out how to clean up

the ktype mess.
Based on a larger patch from Kay Sievers
Cc: Kay Sievers <kay.sievers@vrfy.org>

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---

 drivers/base/core.c |    6 +++---

 1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/base/core.c b/drivers/base/core.c

index 65de221..c134341 100644

--- a/drivers/base/core.c

+++ b/drivers/base/core.c

@@ -108,7 +108,7 @@ static void device_release(struct kobject * kobj)

 	}

 }
-static struct kobj_type ktype_device = {

+static struct kobj_type device_ktype = {

 	.release	= device_release,

 	.sysfs_ops	= &dev_sysfs_ops,

 };

@@ -118,7 +118,7 @@ static int dev_uevent_filter(struct kset *kset, struct kobject *kobj)

 {

 	struct kobj_type *ktype = get_ktype(kobj);
-	if (ktype == &ktype_device) {

+	if (ktype == &device_ktype) {

 		struct device *dev = to_dev(kobj);

 		if (dev->uevent_suppress)

 			return 0;

@@ -405,7 +405,7 @@ static struct device_attribute devt_attr =

  *	devices_subsys - structure to be registered with kobject core.

  */
-decl_subsys(devices, &ktype_device, &device_uevent_ops);

+decl_subsys(devices, &device_ktype, &device_uevent_ops);
 /**

--

1.5.3.4
-

This makes it a bit more sane when trying to figure out how to clean up

the ktype mess.
Based on a larger patch from Kay Sievers
Cc: Kay Sievers <kay.sievers@vrfy.org>

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---

 drivers/base/bus.c |    4 ++--

 1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/base/bus.c b/drivers/base/bus.c

index 6768a01..9a19b07 100644

--- a/drivers/base/bus.c

+++ b/drivers/base/bus.c

@@ -89,7 +89,7 @@ static void driver_release(struct kobject * kobj)

 	 */

 }
-static struct kobj_type ktype_driver = {

+static struct kobj_type driver_ktype = {

 	.sysfs_ops	= &driver_sysfs_ops,

 	.release	= driver_release,

 };

@@ -868,7 +868,7 @@ int bus_register(struct bus_type * bus)
 	kobject_set_name(&bus->drivers.kobj, "drivers");

 	bus->drivers.kobj.parent = &bus->subsys.kobj;

-	bus->drivers.ktype = &ktype_driver;

+	bus->drivers.ktype = &driver_ktype;

 	retval = kset_register(&bus->drivers);

 	if (retval)

 		goto bus_drivers_fail;

--

1.5.3.4
-

This makes it a bit more sane when trying to figure out how to clean up

the ktype mess.
Based on a larger patch from Kay Sievers
Cc: Kay Sievers <kay.sievers@vrfy.org>

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---

 drivers/firmware/edd.c     |    4 ++--

 drivers/firmware/efivars.c |    4 ++--

 2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/firmware/edd.c b/drivers/firmware/edd.c

index 0fb730e..6942e06 100644

--- a/drivers/firmware/edd.c

+++ b/drivers/firmware/edd.c

@@ -625,13 +625,13 @@ static void edd_release(struct kobject * kobj)

 	kfree(dev);

 }
-static struct kobj_type ktype_edd = {

+static struct kobj_type edd_ktype = {

 	.release	= edd_release,

 	.sysfs_ops	= &edd_attr_ops,

 	.default_attrs	= def_attrs,

 };
-static decl_subsys(edd,&ktype_edd,NULL);

+static decl_subsys(edd, &edd_ktype, NULL);
 /**

diff --git a/drivers/firmware/efivars.c b/drivers/firmware/efivars.c

index bfd2d67..858a7b9 100644

--- a/drivers/firmware/efivars.c

+++ b/drivers/firmware/efivars.c

@@ -402,7 +402,7 @@ static struct attribute *def_attrs[] = {

 	NULL,

 };
-static struct kobj_type ktype_efivar = {

+static struct kobj_type efivar_ktype = {

 	.release = efivar_release,

 	.sysfs_ops = &efivar_attr_ops,

 	.default_attrs = def_attrs,

@@ -583,7 +583,7 @@ static struct subsys_attribute *efi_subsys_attrs[] = {

 	NULL,	/* maybe more in the future? */

 };
-static decl_subsys(vars, &ktype_efivar, NULL);

+static decl_subsys(vars, &efivar_ktype, NULL);

 static decl_subsys(efi, NULL, NULL);
 /*

--

1.5.3.4
-

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---

 include/linux/kobject.h |   33 +++++++++++++++++----------------

 1 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/include/linux/kobject.h b/include/linux/kobject.h

index 05cc5b2..973aa7b 100644

--- a/include/linux/kobject.h

+++ b/include/linux/kobject.h

@@ -117,29 +117,30 @@ struct kset_uevent_ops {

 		      struct kobj_uevent_env *env);

 };
-/*

- *	struct kset - a set of kobjects of a specific type, belonging

- *	to a specific subsystem.

- *

- *	All kobjects of a kset should be embedded in an identical

- *	type. This type may have a descriptor, which the kset points

- *	to. This allows there to exist sets of objects of the same

- *	type in different subsystems.

+/**

+ * struct kset - a set of kobjects of a specific type, belonging to a specific subsystem.

  *

- *	A subsystem does not have to be a list of only one type

- *	of object; multiple ksets can belong to one subsystem. All

- *	ksets of a subsystem share the subsystem's lock.

+ * A kset defines a group of kobjects.  They can be individually

+ * different "types" but overall these kobjects all want to be grouped

+ * together and operated on in the same manner.  ksets are used to

+ * define the attribute callbacks and other common events that happen to

+ * a kobject.

  *

- *	Each kset can support specific event variables; it can

- *	supress the event generation or add subsystem specific

- *	variables carried with the event.

+ * @ktype: the struct kobj_type for this specific kset

+ * @list: the list of all kobjects for this kset

+ * @list_lock: a lock for iterating over the kobjects

+ * @kobj: the embedded kobject for this kset (recursion, isn't it fun...)

+ * @uevent_ops: the set of uevent operations for this kset.  These are

+ * called whenever a kobject has something happen to it so that the kset

+ * can add new environment variables, or filter out the uevents if so

+ * desired.

  */

 struct kset {

-	struct kobj_type	* ktype;

+...
[ message continues ]

I've been hacking on these files for a while now, might as well make it

official...
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---

 include/linux/kobject.h |    6 ++++--

 lib/kobject.c           |    2 ++

 2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/include/linux/kobject.h b/include/linux/kobject.h

index 973aa7b..4a0d27f 100644

--- a/include/linux/kobject.h

+++ b/include/linux/kobject.h

@@ -1,8 +1,10 @@

 /*

  * kobject.h - generic kernel object infrastructure.

  *

- * Copyright (c) 2002-2003	Patrick Mochel

- * Copyright (c) 2002-2003	Open Source Development Labs

+ * Copyright (c) 2002-2003 Patrick Mochel

+ * Copyright (c) 2002-2003 Open Source Development Labs

+ * Copyright (c) 2006-2007 Greg Kroah-Hartman <greg@kroah.com>

+ * Copyright (c) 2006-2007 Novell Inc.

  *

  * This file is released under the GPLv2.

  *

diff --git a/lib/kobject.c b/lib/kobject.c

index b7e0646..03d4036 100644

--- a/lib/kobject.c

+++ b/lib/kobject.c

@@ -2,6 +2,8 @@

  * kobject.c - library routines for handling generic kernel objects

  *

  * Copyright (c) 2002-2003 Patrick Mochel <mochel@osdl.org>

+ * Copyright (c) 2006-2007 Greg Kroah-Hartman <greg@kroah.com>

+ * Copyright (c) 2006-2007 Novell Inc.

  *

  * This file is released under the GPLv2.

  *

--

1.5.3.4
-

From: Tejun Heo <htejun@gmail.com>
Sysfs has gone through considerable amount of reimplementation.  Add

copyrights.  Any objections?  :-)
Signed-off-by: Tejun Heo <htejun@gmail.com>

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---

 fs/sysfs/bin.c        |    8 +++++++-

 fs/sysfs/dir.c        |   10 +++++++++-

 fs/sysfs/file.c       |   10 +++++++++-

 fs/sysfs/inode.c      |    8 ++++++--

 fs/sysfs/mount.c      |   10 +++++++++-

 fs/sysfs/symlink.c    |   10 +++++++++-

 fs/sysfs/sysfs.h      |   10 ++++++++++

 include/linux/sysfs.h |    2 ++

 8 files changed, 61 insertions(+), 7 deletions(-)
diff --git a/fs/sysfs/bin.c b/fs/sysfs/bin.c

index 247ea19..006fc64 100644

--- a/fs/sysfs/bin.c

+++ b/fs/sysfs/bin.c

@@ -1,9 +1,15 @@

 /*

- * bin.c - binary file operations for sysfs.

+ * fs/sysfs/bin.c - sysfs binary file implementation

  *

  * Copyright (c) 2003 Patrick Mochel

  * Copyright (c) 2003 Matthew Wilcox

  * Copyright (c) 2004 Silicon Graphics, Inc.

+ * Copyright (c) 2007 SUSE Linux Products GmbH

+ * Copyright (c) 2007 Tejun Heo <teheo@suse.de>

+ *

+ * This file is released under the GPLv2.

+ *

+ * Please see Documentation/filesystems/sysfs.txt for more information.

  */
 #undef DEBUG

diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c

index e301a12..9161db4 100644

--- a/fs/sysfs/dir.c

+++ b/fs/sysfs/dir.c

@@ -1,5 +1,13 @@

 /*

- * dir.c - Operations for sysfs directories.

+ * fs/sysfs/dir.c - sysfs core and dir operation implementation

+ *

+ * Copyright (c) 2001-3 Patrick Mochel

+ * Copyright (c) 2007 SUSE Linux Products GmbH

+ * Copyright (c) 2007 Tejun Heo <teheo@suse.de>

+ *

+ * This file is released under the GPLv2.

+ *

+ * Please see Documentation/filesystems/sysfs.txt for more information.

  */
 #undef DEBUG

diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c

index c05f961..d3be1e7 100644

--- a/fs/sysfs/file.c

+++ b/fs/sysfs/file.c

@@ -1,5 +1,13 @@

 /*

- * file.c - operations for regular (text) files.

+ * fs/sysfs/...
[ message continues ]

From: Alan Stern <stern@rowland.harvard.edu>
This patch (as993) merges the suspend.c and resume.c files in

drivers/base/power into main.c, making some public symbols private.
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>

Acked-by: Rafael J. Wysocki <rjw@sisk.pl>

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---

 drivers/base/power/Makefile  |    2 +-

 drivers/base/power/main.c    |  344 +++++++++++++++++++++++++++++++++++++++++-

 drivers/base/power/power.h   |   32 +----

 drivers/base/power/resume.c  |  149 ------------------

 drivers/base/power/suspend.c |  210 -------------------------

 5 files changed, 343 insertions(+), 394 deletions(-)

 delete mode 100644 drivers/base/power/resume.c

 delete mode 100644 drivers/base/power/suspend.c
diff --git a/drivers/base/power/Makefile b/drivers/base/power/Makefile

index 9caeaea..a803733 100644

--- a/drivers/base/power/Makefile

+++ b/drivers/base/power/Makefile

@@ -1,5 +1,5 @@

 obj-y			:= shutdown.o

-obj-$(CONFIG_PM_SLEEP)	+= main.o suspend.o resume.o sysfs.o

+obj-$(CONFIG_PM_SLEEP)	+= main.o sysfs.o

 obj-$(CONFIG_PM_TRACE)	+= trace.o
 ifeq ($(CONFIG_DEBUG_DRIVER),y)

diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c

index eb9f38d..0ab4ab2 100644

--- a/drivers/base/power/main.c

+++ b/drivers/base/power/main.c

@@ -20,19 +20,24 @@

  */
 #include <linux/device.h>

+#include <linux/kallsyms.h>

 #include <linux/mutex.h>

+#include <linux/pm.h>

+#include <linux/resume-trace.h>
+#include "../base.h"

 #include "power.h"
 LIST_HEAD(dpm_active);

-LIST_HEAD(dpm_off);

-LIST_HEAD(dpm_off_irq);

+static LIST_HEAD(dpm_off);

+static LIST_HEAD(dpm_off_irq);
-DEFINE_MUTEX(dpm_mtx);

-DEFINE_MUTEX(dpm_list_mtx);

+static DEFINE_MUTEX(dpm_mtx);

+static DEFINE_MUTEX(dpm_list_mtx);
 int (*platform_enable_wakeup)(struct device *dev, int is_on);
+

 int device_pm_add(struct device *dev)

 {

 	int error;

@@ -61,3 +66,334 @@ void device_pm_remove...
[ message continues ]