make fs/{namespace,super}.c forget about acct.h

These externs belong in fs/internal.h.  Rename (they are not acct-specific
anymore) and move them over there.

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

diff --git a/fs/fs_pin.c b/fs/fs_pin.c
index f3ce0b8..9368236 100644 (file)
--- a/fs/fs_pin.c
+++ b/fs/fs_pin.c
@@ -1,6 +1,7 @@
 #include <linux/fs.h>
 #include <linux/slab.h>
 #include <linux/fs_pin.h>
+#include "internal.h"
 #include "mount.h"
 
 static void pin_free_rcu(struct rcu_head *head)
@@ -32,13 +33,13 @@ void pin_insert(struct fs_pin *pin, struct vfsmount *m)
        spin_unlock(&pin_lock);
 }
 
-void acct_auto_close_mnt(struct hlist_head *list)
+void mnt_pin_kill(struct mount *m)
 {
        while (1) {
                struct hlist_node *p;
                struct fs_pin *pin;
                rcu_read_lock();
-               p = ACCESS_ONCE(list->first);
+               p = ACCESS_ONCE(m->mnt_pins.first);
                if (!p) {
                        rcu_read_unlock();
                        break;
@@ -54,13 +55,13 @@ void acct_auto_close_mnt(struct hlist_head *list)
        }
 }
 
-void acct_auto_close(struct hlist_head *list)
+void sb_pin_kill(struct super_block *sb)
 {
        while (1) {
                struct hlist_node *p;
                struct fs_pin *pin;
                rcu_read_lock();
-               p = ACCESS_ONCE(list->first);
+               p = ACCESS_ONCE(sb->s_pins.first);
                if (!p) {
                        rcu_read_unlock();
                        break;

diff --git a/fs/internal.h b/fs/internal.h
index 9a2edba..e325b4f 100644 (file)
--- a/fs/internal.h
+++ b/fs/internal.h
@@ -143,3 +143,9 @@ extern long do_splice_direct(struct file *in, loff_t *ppos, struct file *out,
  * pipe.c
  */
 extern const struct file_operations pipefifo_fops;
+
+/*
+ * fs_pin.c
+ */
+extern void sb_pin_kill(struct super_block *sb);
+extern void mnt_pin_kill(struct mount *m);

diff --cc fs/namespace.c
Simple merge

diff --cc fs/super.c
Simple merge

diff --cc include/linux/acct.h
Simple merge