summaryrefslogtreecommitdiff
path: root/include/linux/kernfs.h
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-01-14 02:30:47 +0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-01-14 02:30:47 +0400
commit4f4b1b6471cf219d136776f9ff9631a07c4e92b5 (patch)
treee70651b3459b90062cf59797a57e5d90e88e4166 /include/linux/kernfs.h
parent55f6e30d0a6a8975cc0831e8a4a3715b815b6a2f (diff)
downloadlinux-4f4b1b6471cf219d136776f9ff9631a07c4e92b5.tar.xz
Revert "kernfs: restructure removal path to fix possible premature return"
This reverts commit 45a140e587f3d32d8d424ed940dffb61e1739047. 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.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/kernfs.h b/include/linux/kernfs.h
index 61bd7ae6b8e0..289d4f639ade 100644
--- a/include/linux/kernfs.h
+++ b/include/linux/kernfs.h
@@ -37,7 +37,6 @@ enum kernfs_node_type {
#define KERNFS_FLAG_MASK ~KERNFS_TYPE_MASK
enum kernfs_node_flag {
- KERNFS_JUST_DEACTIVATED = 0x0010, /* used to aid lockdep annotation */
KERNFS_NS = 0x0020,
KERNFS_HAS_SEQ_SHOW = 0x0040,
KERNFS_HAS_MMAP = 0x0080,