make ramfs_fill_super() static

all users should just call ramfs_mount()

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

diff --git a/fs/ramfs/inode.c b/fs/ramfs/inode.c
index 733c6b4193dc86feec5dd4e2291f11a896dcb0e7..b85d1e77e934d992439603c26cd1dc92a4789006 100644 (file)
--- a/fs/ramfs/inode.c
+++ b/fs/ramfs/inode.c
@@ -217,7 +217,7 @@ static int ramfs_parse_options(char *data, struct ramfs_mount_opts *opts)
        return 0;
 }
 
-int ramfs_fill_super(struct super_block *sb, void *data, int silent)
+static int ramfs_fill_super(struct super_block *sb, void *data, int silent)
 {
        struct ramfs_fs_info *fsi;
        struct inode *inode;

diff --git a/include/linux/ramfs.h b/include/linux/ramfs.h
index ee582bdb7fdaaa8eb35fbb07ec88c3494ab0ee47..e4d7d141545e534667a7d352d91c09446d96224d 100644 (file)
--- a/include/linux/ramfs.h
+++ b/include/linux/ramfs.h
@@ -20,6 +20,4 @@ extern int ramfs_nommu_expand_for_mapping(struct inode *inode, size_t newsize);
 extern const struct file_operations ramfs_file_operations;
 extern const struct vm_operations_struct generic_file_vm_ops;
 
-int ramfs_fill_super(struct super_block *sb, void *data, int silent);
-
 #endif

diff --git a/init/do_mounts.c b/init/do_mounts.c
index 53cb37b66227f6a6d484bc961edd4bf99b811541..baedc2ef579efb63a0b26997fb2776d34aaf9e2f 100644 (file)
--- a/init/do_mounts.c
+++ b/init/do_mounts.c
@@ -630,12 +630,10 @@ static bool is_tmpfs;
 static struct dentry *rootfs_mount(struct file_system_type *fs_type,
        int flags, const char *dev_name, void *data)
 {
-       void *fill = ramfs_fill_super;
-
        if (IS_ENABLED(CONFIG_TMPFS) && is_tmpfs)
-               fill = shmem_fill_super;
+               return mount_nodev(fs_type, flags, data, shmem_fill_super);
 
-       return mount_nodev(fs_type, flags, data, fill);
+       return ramfs_mount(fs_type, flags, dev_name, data);
 }
 
 struct file_system_type rootfs_fs_type = {