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
--- 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 @@
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(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
--- a/fs/internal.h
+++ b/fs/internal.h
@@ -143,3 +143,9 @@
* 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 --git a/fs/namespace.c b/fs/namespace.c
index 22e530a..0e4ce51 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -16,7 +16,6 @@
#include <linux/namei.h>
#include <linux/security.h>
#include <linux/idr.h>
-#include <linux/acct.h> /* acct_auto_close_mnt */
#include <linux/init.h> /* init_rootfs */
#include <linux/fs_struct.h> /* get_fs_root et.al. */
#include <linux/fsnotify.h> /* fsnotify_vfsmount_delete */
@@ -956,7 +955,7 @@
mnt->mnt_pinned = 0;
rcu_read_unlock();
unlock_mount_hash();
- acct_auto_close_mnt(&mnt->mnt_pins);
+ mnt_pin_kill(mnt);
goto put_again;
}
if (unlikely(mnt->mnt.mnt_flags & MNT_DOOMED)) {
diff --git a/fs/super.c b/fs/super.c
index a369f89..a371ce6 100644
--- a/fs/super.c
+++ b/fs/super.c
@@ -22,7 +22,6 @@
#include <linux/export.h>
#include <linux/slab.h>
-#include <linux/acct.h>
#include <linux/blkdev.h>
#include <linux/mount.h>
#include <linux/security.h>
@@ -707,7 +706,7 @@
if (remount_ro) {
if (sb->s_pins.first) {
up_write(&sb->s_umount);
- acct_auto_close(&sb->s_pins);
+ sb_pin_kill(sb);
down_write(&sb->s_umount);
if (!sb->s_root)
return 0;