Commit 81440e73 authored Nov 27, 2013 by Greg Kroah-Hartman

Revert "sysfs: handle duplicate removal attempts in sysfs_remove_group()"

This reverts commit 54d71145.

The root cause of these "inverted" sysfs removals have now been found,
so there is no need for this patch.  Keep this functionality around so
that this type of error doesn't show up in driver code again.

Cc: Mika Westerberg <mika.westerberg@linux.intel.com>
Cc: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Cc: Tejun Heo <tj@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 027a485d

fs/sysfs/group.c

+0 −9

Original line number	Diff line number	Diff line
		@@ -206,15 +206,6 @@ void sysfs_remove_group(struct kobject *kobj,
		struct sysfs_dirent *dir_sd = kobj->sd;
		struct sysfs_dirent *sd;

		/*
		* Sysfs directories are now removed recursively by
		* sysfs_remove_dir(). This means that the function can be called
		* for a group whose sysfs entry is already removed. In that case
		* all its groups are guaranteed to be already removed.
		*/
		if (dir_sd->s_flags & SYSFS_FLAG_REMOVED)
		return;

		if (grp->name) {
		sd = sysfs_get_dirent(dir_sd, grp->name);
		if (!sd) {

Admin message