diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-01-13 16:51:36 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-01-13 16:51:36 -0500 |
commit | a30f82b7ebc87cdec3ef48303278f02970086118 (patch) | |
tree | 9ae4816d0499319aac3f8acbc262b17524c48eaa /include/linux/sysfs.h | |
parent | ce9b499c9f58d7f3f680413f3ab5407f4e647ba2 (diff) |
Revert "sysfs, driver-core: remove unused {sysfs|device}_schedule_callback_owner()"
This reverts commit d1ba277e79889085a2faec3b68b91ce89c63f888.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/sysfs.h')
-rw-r--r-- | include/linux/sysfs.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/include/linux/sysfs.h b/include/linux/sysfs.h index 14df05415af9..bd96c603ab6c 100644 --- a/include/linux/sysfs.h +++ b/include/linux/sysfs.h | |||
@@ -178,6 +178,9 @@ struct sysfs_ops { | |||
178 | 178 | ||
179 | #ifdef CONFIG_SYSFS | 179 | #ifdef CONFIG_SYSFS |
180 | 180 | ||
181 | int sysfs_schedule_callback(struct kobject *kobj, void (*func)(void *), | ||
182 | void *data, struct module *owner); | ||
183 | |||
181 | int __must_check sysfs_create_dir_ns(struct kobject *kobj, const void *ns); | 184 | int __must_check sysfs_create_dir_ns(struct kobject *kobj, const void *ns); |
182 | void sysfs_remove_dir(struct kobject *kobj); | 185 | void sysfs_remove_dir(struct kobject *kobj); |
183 | int __must_check sysfs_rename_dir_ns(struct kobject *kobj, const char *new_name, | 186 | int __must_check sysfs_rename_dir_ns(struct kobject *kobj, const char *new_name, |
@@ -246,6 +249,12 @@ int __must_check sysfs_init(void); | |||
246 | 249 | ||
247 | #else /* CONFIG_SYSFS */ | 250 | #else /* CONFIG_SYSFS */ |
248 | 251 | ||
252 | static inline int sysfs_schedule_callback(struct kobject *kobj, | ||
253 | void (*func)(void *), void *data, struct module *owner) | ||
254 | { | ||
255 | return -ENOSYS; | ||
256 | } | ||
257 | |||
249 | static inline int sysfs_create_dir_ns(struct kobject *kobj, const void *ns) | 258 | static inline int sysfs_create_dir_ns(struct kobject *kobj, const void *ns) |
250 | { | 259 | { |
251 | return 0; | 260 | return 0; |