Bury __put_super_and_need_restart()

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

diff --git a/fs/drop_caches.c b/fs/drop_caches.c
index 42728a1f795f7fd83990f9502d4efabd5350019b..52047cf4177f46033b906a59eeca90aa9f8390db 100644 (file)
--- a/fs/drop_caches.c
+++ b/fs/drop_caches.c
@@ -8,6 +8,7 @@
 #include <linux/writeback.h>
 #include <linux/sysctl.h>
 #include <linux/gfp.h>
+#include "internal.h"
 
 /* A global variable is a bit ugly, but it keeps the code simple */
 int sysctl_drop_caches;

diff --git a/fs/internal.h b/fs/internal.h
index 8a03a5447bdf392a826b088f7329c68af32f3d2e..6b706bc60a66bbb3cecb7477f2ea72e0a091aa84 100644 (file)
--- a/fs/internal.h
+++ b/fs/internal.h
@@ -87,6 +87,8 @@ extern struct file *get_empty_filp(void);
  * super.c
  */
 extern int do_remount_sb(struct super_block *, int, void *, int);
+extern void __put_super(struct super_block *sb);
+extern void put_super(struct super_block *sb);
 
 /*
  * open.c

diff --git a/fs/quota/quota.c b/fs/quota/quota.c
index 2196f8b07c1f8e2f844b5de59536d7cff1932752..3ce1553ea7ebc557b265b70a5a4efeab07e567b3 100644 (file)
--- a/fs/quota/quota.c
+++ b/fs/quota/quota.c
@@ -18,6 +18,7 @@
 #include <linux/quotaops.h>
 #include <linux/types.h>
 #include <linux/writeback.h>
+#include "../internal.h"
 
 static int check_quotactl_permission(struct super_block *sb, int type, int cmd,
                                     qid_t id)

diff --git a/fs/super.c b/fs/super.c
index 1f72e0d42d8fea7d77b1bb1c0f11b396eb6de1d5..95adbb3d8e581e2e8755e4601554a3dfe8ce10ef 100644 (file)
--- a/fs/super.c
+++ b/fs/super.c
@@ -127,40 +127,14 @@ static inline void destroy_super(struct super_block *s)
 /* Superblock refcounting  */
 
 /*
- * Drop a superblock's refcount.  Returns non-zero if the superblock was
- * destroyed.  The caller must hold sb_lock.
+ * Drop a superblock's refcount.  The caller must hold sb_lock.
  */
-int __put_super(struct super_block *sb)
+void __put_super(struct super_block *sb)
 {
-       int ret = 0;
-
        if (!--sb->s_count) {
                list_del_init(&sb->s_list);
                destroy_super(sb);
-               ret = 1;
-       }
-       return ret;
-}
-
-/*
- * Drop a superblock's refcount.
- * Returns non-zero if the superblock is about to be destroyed and
- * at least is already removed from super_blocks list, so if we are
- * making a loop through super blocks then we need to restart.
- * The caller must hold sb_lock.
- */
-int __put_super_and_need_restart(struct super_block *sb)
-{
-       /* check for race with generic_shutdown_super() */
-       if (list_empty(&sb->s_instances)) {
-               /* super block is removed, need to restart... */
-               __put_super(sb);
-               return 1;
        }
-       /* can't be the last, since s_list is still in use */
-       sb->s_count--;
-       BUG_ON(sb->s_count == 0);
-       return 0;
 }
 
 /**

diff --git a/include/linux/fs.h b/include/linux/fs.h
index e1c7427802b8f494957e55e6ec41cdf6ae2fea9f..523086714c7483766e5a9a4fac9ea41f8b708919 100644 (file)
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1778,9 +1778,6 @@ extern int get_sb_pseudo(struct file_system_type *, char *,
        const struct super_operations *ops, unsigned long,
        struct vfsmount *mnt);
 extern void simple_set_mnt(struct vfsmount *mnt, struct super_block *sb);
-int __put_super_and_need_restart(struct super_block *sb);
-int __put_super(struct super_block *sb);
-void put_super(struct super_block *sb);
 
 /* Alas, no aliases. Too much hassle with bringing module.h everywhere */
 #define fops_get(fops) \