procfs: Move proc_fill_super() to fs/proc/root.c

Move proc_fill_super() to fs/proc/root.c as that's where the other
superblock stuff is.

Signed-off-by: David Howells <dhowells@redhat.com>
Reviewed-by: Alexey Dobriyan <adobriyan@gmail.com>
cc: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --git a/fs/proc/inode.c b/fs/proc/inode.c
index da649ccd680431424c2d5ec82f6fa2487f5a0c30..17b5261206ddaff0bdb8ad6c43d9b8565e795e58 100644 (file)
--- a/fs/proc/inode.c
+++ b/fs/proc/inode.c
@@ -24,7 +24,6 @@
 #include <linux/seq_file.h>
 #include <linux/slab.h>
 #include <linux/mount.h>
-#include <linux/magic.h>
 
 #include <linux/uaccess.h>
 
@@ -122,7 +121,7 @@ static int proc_show_options(struct seq_file *seq, struct dentry *root)
        return 0;
 }
 
-static const struct super_operations proc_sops = {
+const struct super_operations proc_sops = {
        .alloc_inode    = proc_alloc_inode,
        .destroy_inode  = proc_destroy_inode,
        .drop_inode     = generic_delete_inode,
@@ -488,51 +487,3 @@ struct inode *proc_get_inode(struct super_block *sb, struct proc_dir_entry *de)
               pde_put(de);
        return inode;
 }
-
-int proc_fill_super(struct super_block *s, void *data, int silent)
-{
-       struct pid_namespace *ns = get_pid_ns(s->s_fs_info);
-       struct inode *root_inode;
-       int ret;
-
-       if (!proc_parse_options(data, ns))
-               return -EINVAL;
-
-       /* User space would break if executables or devices appear on proc */
-       s->s_iflags |= SB_I_USERNS_VISIBLE | SB_I_NOEXEC | SB_I_NODEV;
-       s->s_flags |= SB_NODIRATIME | SB_NOSUID | SB_NOEXEC;
-       s->s_blocksize = 1024;
-       s->s_blocksize_bits = 10;
-       s->s_magic = PROC_SUPER_MAGIC;
-       s->s_op = &proc_sops;
-       s->s_time_gran = 1;
-
-       /*
-        * procfs isn't actually a stacking filesystem; however, there is
-        * too much magic going on inside it to permit stacking things on
-        * top of it
-        */
-       s->s_stack_depth = FILESYSTEM_MAX_STACK_DEPTH;
-       
-       /* procfs dentries and inodes don't require IO to create */
-       s->s_shrink.seeks = 0;
-
-       pde_get(&proc_root);
-       root_inode = proc_get_inode(s, &proc_root);
-       if (!root_inode) {
-               pr_err("proc_fill_super: get root inode failed\n");
-               return -ENOMEM;
-       }
-
-       s->s_root = d_make_root(root_inode);
-       if (!s->s_root) {
-               pr_err("proc_fill_super: allocate dentry failed\n");
-               return -ENOMEM;
-       }
-
-       ret = proc_setup_self(s);
-       if (ret) {
-               return ret;
-       }
-       return proc_setup_thread_self(s);
-}

diff --git a/fs/proc/internal.h b/fs/proc/internal.h
index 5185d7f6a51ee845fc12c6d49d4497d766af6c23..97157c0410a247979b51e757ea34cf63a3ca8350 100644 (file)
--- a/fs/proc/internal.h
+++ b/fs/proc/internal.h
@@ -205,13 +205,12 @@ struct pde_opener {
        struct completion *c;
 } __randomize_layout;
 extern const struct inode_operations proc_link_inode_operations;
-
 extern const struct inode_operations proc_pid_link_inode_operations;
+extern const struct super_operations proc_sops;
 
 void proc_init_kmemcache(void);
 void set_proc_pid_nlink(void);
 extern struct inode *proc_get_inode(struct super_block *, struct proc_dir_entry *);
-extern int proc_fill_super(struct super_block *, void *data, int flags);
 extern void proc_entry_rundown(struct proc_dir_entry *);
 
 /*
@@ -269,7 +268,6 @@ static inline void proc_tty_init(void) {}
  * root.c
  */
 extern struct proc_dir_entry proc_root;
-extern int proc_parse_options(char *options, struct pid_namespace *pid);
 
 extern void proc_self_init(void);
 extern int proc_remount(struct super_block *, int *, char *);

diff --git a/fs/proc/root.c b/fs/proc/root.c
index f4b1a9d2eca6010be2838197dc9741ec67a3857e..fe4f64b3250b0031ef12e89214cad8905181c403 100644 (file)
--- a/fs/proc/root.c
+++ b/fs/proc/root.c
@@ -23,6 +23,7 @@
 #include <linux/pid_namespace.h>
 #include <linux/parser.h>
 #include <linux/cred.h>
+#include <linux/magic.h>
 
 #include "internal.h"
 
@@ -36,7 +37,7 @@ static const match_table_t tokens = {
        {Opt_err, NULL},
 };
 
-int proc_parse_options(char *options, struct pid_namespace *pid)
+static int proc_parse_options(char *options, struct pid_namespace *pid)
 {
        char *p;
        substring_t args[MAX_OPT_ARGS];
@@ -78,6 +79,54 @@ int proc_parse_options(char *options, struct pid_namespace *pid)
        return 1;
 }
 
+static int proc_fill_super(struct super_block *s, void *data, int silent)
+{
+       struct pid_namespace *ns = get_pid_ns(s->s_fs_info);
+       struct inode *root_inode;
+       int ret;
+
+       if (!proc_parse_options(data, ns))
+               return -EINVAL;
+
+       /* User space would break if executables or devices appear on proc */
+       s->s_iflags |= SB_I_USERNS_VISIBLE | SB_I_NOEXEC | SB_I_NODEV;
+       s->s_flags |= SB_NODIRATIME | SB_NOSUID | SB_NOEXEC;
+       s->s_blocksize = 1024;
+       s->s_blocksize_bits = 10;
+       s->s_magic = PROC_SUPER_MAGIC;
+       s->s_op = &proc_sops;
+       s->s_time_gran = 1;
+
+       /*
+        * procfs isn't actually a stacking filesystem; however, there is
+        * too much magic going on inside it to permit stacking things on
+        * top of it
+        */
+       s->s_stack_depth = FILESYSTEM_MAX_STACK_DEPTH;
+       
+       /* procfs dentries and inodes don't require IO to create */
+       s->s_shrink.seeks = 0;
+
+       pde_get(&proc_root);
+       root_inode = proc_get_inode(s, &proc_root);
+       if (!root_inode) {
+               pr_err("proc_fill_super: get root inode failed\n");
+               return -ENOMEM;
+       }
+
+       s->s_root = d_make_root(root_inode);
+       if (!s->s_root) {
+               pr_err("proc_fill_super: allocate dentry failed\n");
+               return -ENOMEM;
+       }
+
+       ret = proc_setup_self(s);
+       if (ret) {
+               return ret;
+       }
+       return proc_setup_thread_self(s);
+}
+
 int proc_remount(struct super_block *sb, int *flags, char *data)
 {
        struct pid_namespace *pid = sb->s_fs_info;