summaryrefslogtreecommitdiffstats
path: root/include/linux/kernfs.h
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2014-01-10 08:57:19 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-01-10 13:44:25 -0800
commitea1c472dfeada211a0100daa7976e8e8e779b858 (patch)
treeba19d47bf769857075edccba0f6006004ec6bb91 /include/linux/kernfs.h
parentd92d2e6bd72b653f9811e0c9c46307c743b3fc58 (diff)
kernfs: replace kernfs_node->u.completion with kernfs_root->deactivate_waitq
kernfs_node->u.completion is used to notify deactivation completion from kernfs_put_active() to kernfs_deactivate(). We now allow multiple racing removals of the same node and the current removal scheme is no longer correct - kernfs_remove() invocation may return before the node is properly deactivated if it races against another removal. The removal path will be restructured to address the issue. To help such restructure which requires supporting multiple waiters, this patch replaces kernfs_node->u.completion with kernfs_root->deactivate_waitq. This makes deactivation event notifications share a per-root waitqueue_head; however, the wait path is quite cold and this will also allow shaving one pointer off kernfs_node. Signed-off-by: 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.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/kernfs.h b/include/linux/kernfs.h
index d2c439db4ef..232f1a63238 100644
--- a/include/linux/kernfs.h
+++ b/include/linux/kernfs.h
@@ -15,7 +15,7 @@
#include <linux/lockdep.h>
#include <linux/rbtree.h>
#include <linux/atomic.h>
-#include <linux/completion.h>
+#include <linux/wait.h>
struct file;
struct iattr;
@@ -91,7 +91,6 @@ struct kernfs_node {
struct rb_node rb;
union {
- struct completion *completion;
struct kernfs_node *removed_list;
} u;
@@ -132,6 +131,7 @@ struct kernfs_root {
/* private fields, do not use outside kernfs proper */
struct ida ino_ida;
struct kernfs_dir_ops *dir_ops;
+ wait_queue_head_t deactivate_waitq;
};
struct kernfs_open_file {