summaryrefslogtreecommitdiff
path: root/include/linux/kernfs.h
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-01-14 02:09:38 +0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-01-14 02:09:38 +0400
commit9b0925a6ff64a33be45497e3c798bfee8790b102 (patch)
tree827aec07fe844addd8e1dd2d1f09b4bb855c9cd1 /include/linux/kernfs.h
parenta9f138b0e537de55933335d580ebd38c2bc53c47 (diff)
downloadlinux-9b0925a6ff64a33be45497e3c798bfee8790b102.tar.xz
Revert "kernfs: implement kernfs_{de|re}activate[_self]()"
This reverts commit 9f010c2ad5194a4b682e747984477850fabd03be. 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/kernfs.h')
-rw-r--r--include/linux/kernfs.h7
1 files changed, 1 insertions, 6 deletions
diff --git a/include/linux/kernfs.h b/include/linux/kernfs.h
index ac8693027058..9b5a4bb88c64 100644
--- a/include/linux/kernfs.h
+++ b/include/linux/kernfs.h
@@ -80,8 +80,6 @@ struct kernfs_elem_attr {
struct kernfs_node {
atomic_t count;
atomic_t active;
- int deact_depth;
- unsigned int hash; /* ns + name hash */
#ifdef CONFIG_DEBUG_LOCK_ALLOC
struct lockdep_map dep_map;
#endif
@@ -92,6 +90,7 @@ struct kernfs_node {
struct rb_node rb;
const void *ns; /* namespace tag */
+ unsigned int hash; /* ns + name hash */
union {
struct kernfs_elem_dir dir;
struct kernfs_elem_symlink symlink;
@@ -234,10 +233,6 @@ struct kernfs_node *__kernfs_create_file(struct kernfs_node *parent,
struct kernfs_node *kernfs_create_link(struct kernfs_node *parent,
const char *name,
struct kernfs_node *target);
-void kernfs_deactivate(struct kernfs_node *kn);
-void kernfs_reactivate(struct kernfs_node *kn);
-void kernfs_deactivate_self(struct kernfs_node *kn);
-void kernfs_reactivate_self(struct kernfs_node *kn);
void kernfs_remove(struct kernfs_node *kn);
int kernfs_remove_by_name_ns(struct kernfs_node *parent, const char *name,
const void *ns);