aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-11-27 12:44:55 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-11-27 12:44:55 -0500
commit81440e73744446adbe5b5d1f19460203d275028f (patch)
tree8456e951c40d36a72970eef0a57d40e15bbfc5a8 /fs
parent027a485d12e089314360d459b8d847104dd28702 (diff)
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>
Diffstat (limited to 'fs')
-rw-r--r--fs/sysfs/group.c9
1 files changed, 0 insertions, 9 deletions
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,
206 struct sysfs_dirent *dir_sd = kobj->sd; 206 struct sysfs_dirent *dir_sd = kobj->sd;
207 struct sysfs_dirent *sd; 207 struct sysfs_dirent *sd;
208 208
209 /*
210 * Sysfs directories are now removed recursively by
211 * sysfs_remove_dir(). This means that the function can be called
212 * for a group whose sysfs entry is already removed. In that case
213 * all its groups are guaranteed to be already removed.
214 */
215 if (dir_sd->s_flags & SYSFS_FLAG_REMOVED)
216 return;
217
218 if (grp->name) { 209 if (grp->name) {
219 sd = sysfs_get_dirent(dir_sd, grp->name); 210 sd = sysfs_get_dirent(dir_sd, grp->name);
220 if (!sd) { 211 if (!sd) {