summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-01-14 02:20:56 +0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-01-14 02:20:56 +0400
commit7653fe9d6cddc3fc5e4220608079006d8ac0054c (patch)
tree637f23e79a8956fe1a59faa62060ef369ab5f421 /include/linux
parentf4b3e631b39db31f7375cce0b5e4111d14cde511 (diff)
downloadlinux-7653fe9d6cddc3fc5e4220608079006d8ac0054c.tar.xz
Revert "kernfs: remove kernfs_addrm_cxt"
This reverts commit 99177a34110889a8f2c36420c34e3bcc9bfd8a70. 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')
-rw-r--r--include/linux/kernfs.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/kernfs.h b/include/linux/kernfs.h
index 9b5a4bb88c64..61bd7ae6b8e0 100644
--- a/include/linux/kernfs.h
+++ b/include/linux/kernfs.h
@@ -89,6 +89,10 @@ struct kernfs_node {
struct rb_node rb;
+ union {
+ struct kernfs_node *removed_list;
+ } u;
+
const void *ns; /* namespace tag */
unsigned int hash; /* ns + name hash */
union {