Merge branch 'master' into ysato-h8300

[uclinux-h8/linux.git] / include / linux / fs_pin.h

diff --git a/include/linux/fs_pin.h b/include/linux/fs_pin.h
index f66525e..3886b3b 100644 (file)
--- a/include/linux/fs_pin.h
+++ b/include/linux/fs_pin.h
@@ -1,17 +1,24 @@
-#include <linux/fs.h>
+#include <linux/wait.h>
 
 struct fs_pin {
-       atomic_long_t           count;
-       union {
-               struct {
-                       struct hlist_node       s_list;
-                       struct hlist_node       m_list;
-               };
-               struct rcu_head rcu;
-       };
+       wait_queue_head_t       wait;
+       int                     done;
+       struct hlist_node       s_list;
+       struct hlist_node       m_list;
        void (*kill)(struct fs_pin *);
 };
 
-void pin_put(struct fs_pin *);
+struct vfsmount;
+
+static inline void init_fs_pin(struct fs_pin *p, void (*kill)(struct fs_pin *))
+{
+       init_waitqueue_head(&p->wait);
+       INIT_HLIST_NODE(&p->s_list);
+       INIT_HLIST_NODE(&p->m_list);
+       p->kill = kill;
+}
+
 void pin_remove(struct fs_pin *);
+void pin_insert_group(struct fs_pin *, struct vfsmount *, struct hlist_head *);
 void pin_insert(struct fs_pin *, struct vfsmount *);
+void pin_kill(struct fs_pin *);