From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 27 Nov 2013 17:44:55 +0000 (-0800)
Subject: Revert "sysfs: handle duplicate removal attempts in sysfs_remove_group()"
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=81440e73744446adbe5b5d1f19460203d275028f;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

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

This reverts commit 54d71145a4548330313ca664a4a009772fe8b7dd.

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>
---

diff --git a/fs/sysfs/group.c b/fs/sysfs/group.c
index 3796afdff40c..1898a10e38ce 100644
--- a/fs/sysfs/group.c
+++ b/fs/sysfs/group.c
@@ -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) {