summaryrefslogtreecommitdiffstats
path: root/include/linux/kernfs.h
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-01-13 14:39:52 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-01-13 14:39:52 -0800
commit0890147fe09ff7e8275a162b1ab76ab5e3158c6d (patch)
tree797d8beb9a38fb4580d2ad628571615528f18028 /include/linux/kernfs.h
parent798c75a0d44cdbd6e3d82a6a676e6de38525b3bb (diff)
downloadop-kernel-dev-0890147fe09ff7e8275a162b1ab76ab5e3158c6d.zip
op-kernel-dev-0890147fe09ff7e8275a162b1ab76ab5e3158c6d.tar.gz
Revert "kernfs: remove KERNFS_ACTIVE_REF and add kernfs_lockdep()"
This reverts commit a69d001cfc712b96ec9d7ba44d6285702a38dabf. 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, 1 insertions, 0 deletions
diff --git a/include/linux/kernfs.h b/include/linux/kernfs.h
index 42ad32f..232f1a6 100644
--- a/include/linux/kernfs.h
+++ b/include/linux/kernfs.h
@@ -34,6 +34,7 @@ enum kernfs_node_type {
};
#define KERNFS_TYPE_MASK 0x000f
+#define KERNFS_ACTIVE_REF KERNFS_FILE
#define KERNFS_FLAG_MASK ~KERNFS_TYPE_MASK
enum kernfs_node_flag {
OpenPOWER on IntegriCloud