take count and rcu_head out of fs_pin

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --git a/include/linux/fs_pin.h b/include/linux/fs_pin.h
index 68a54b7..a2e7191 100644 (file)
--- a/include/linux/fs_pin.h
+++ b/include/linux/fs_pin.h
@@ -1,14 +1,8 @@
 #include <linux/fs.h>
 
 struct fs_pin {
-       atomic_long_t           count;
-       union {
-               struct {
-                       struct hlist_node       s_list;
-                       struct hlist_node       m_list;
-               };
-               struct rcu_head rcu;
-       };
+       struct hlist_node       s_list;
+       struct hlist_node       m_list;
        void (*kill)(struct fs_pin *);
 };
 

diff --cc kernel/acct.c
Simple merge