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/device.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/device.h')
-rw-r--r-- | include/linux/device.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/device.h b/include/linux/device.h index 1ff3f1697513..952b01033c32 100644 --- a/include/linux/device.h +++ b/include/linux/device.h | |||
@@ -560,8 +560,6 @@ extern int device_create_file(struct device *device, | |||
560 | const struct device_attribute *entry); | 560 | const struct device_attribute *entry); |
561 | extern void device_remove_file(struct device *dev, | 561 | extern void device_remove_file(struct device *dev, |
562 | const struct device_attribute *attr); | 562 | const struct device_attribute *attr); |
563 | extern bool device_remove_file_self(struct device *dev, | ||
564 | const struct device_attribute *attr); | ||
565 | extern int __must_check device_create_bin_file(struct device *dev, | 563 | extern int __must_check device_create_bin_file(struct device *dev, |
566 | const struct bin_attribute *attr); | 564 | const struct bin_attribute *attr); |
567 | extern void device_remove_bin_file(struct device *dev, | 565 | extern void device_remove_bin_file(struct device *dev, |