diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-01-13 17:05:13 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-01-13 17:05:13 -0500 |
commit | a9f138b0e537de55933335d580ebd38c2bc53c47 (patch) | |
tree | f54235f920d392519bde975d42aa4b4534f9561a /include/linux/sysfs.h | |
parent | 8634c422c1b7e50ca8e346f65afc140d93a3212c (diff) |
Revert "kernfs, sysfs, driver-core: implement kernfs_remove_self() and its wrappers"
This reverts commit 1ae06819c77cff1ea2833c94f8c093fe8a5c79db.
Tejun writes:
I'm sorry but can you please revert the whole series?
get_active() waiting while a node is deactivated has potential
to lead to deadlock and that deactivate/reactivate interface is
something fundamentally flawed and that cgroup will have to work
with the remove_self() like everybody else. IOW, I think the
first posting was correct.
Cc: Tejun Heo <tj@kernel.org>
Cc: Alan Stern <stern@rowland.harvard.edu>
Cc: kbuild test robot <fengguang.wu@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/sysfs.h')
-rw-r--r-- | include/linux/sysfs.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/include/linux/sysfs.h b/include/linux/sysfs.h index bd96c603ab6c..30b2ebee6439 100644 --- a/include/linux/sysfs.h +++ b/include/linux/sysfs.h | |||
@@ -198,7 +198,6 @@ int __must_check sysfs_chmod_file(struct kobject *kobj, | |||
198 | const struct attribute *attr, umode_t mode); | 198 | const struct attribute *attr, umode_t mode); |
199 | void sysfs_remove_file_ns(struct kobject *kobj, const struct attribute *attr, | 199 | void sysfs_remove_file_ns(struct kobject *kobj, const struct attribute *attr, |
200 | const void *ns); | 200 | const void *ns); |
201 | bool sysfs_remove_file_self(struct kobject *kobj, const struct attribute *attr); | ||
202 | void sysfs_remove_files(struct kobject *kobj, const struct attribute **attr); | 201 | void sysfs_remove_files(struct kobject *kobj, const struct attribute **attr); |
203 | 202 | ||
204 | int __must_check sysfs_create_bin_file(struct kobject *kobj, | 203 | int __must_check sysfs_create_bin_file(struct kobject *kobj, |
@@ -302,12 +301,6 @@ static inline void sysfs_remove_file_ns(struct kobject *kobj, | |||
302 | { | 301 | { |
303 | } | 302 | } |
304 | 303 | ||
305 | static inline bool sysfs_remove_file_self(struct kobject *kobj, | ||
306 | const struct attribute *attr) | ||
307 | { | ||
308 | return false; | ||
309 | } | ||
310 | |||
311 | static inline void sysfs_remove_files(struct kobject *kobj, | 304 | static inline void sysfs_remove_files(struct kobject *kobj, |
312 | const struct attribute **attr) | 305 | const struct attribute **attr) |
313 | { | 306 | { |