There are no longer any users of the proc_mnt global and having it suggests that we have a single instance of proc, so just kill it. Signed-off-by: Eric W. Biederman <ebiederm@xxxxxxxxxxxx> --- fs/proc/inode.c | 2 -- fs/proc/root.c | 5 ++--- include/linux/proc_fs.h | 1 - 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/fs/proc/inode.c b/fs/proc/inode.c index 82b3a1b..96446ac 100644 --- a/fs/proc/inode.c +++ b/fs/proc/inode.c @@ -71,8 +71,6 @@ static void proc_delete_inode(struct inode *inode) clear_inode(inode); } -struct vfsmount *proc_mnt; - static struct kmem_cache * proc_inode_cachep; static struct inode *proc_alloc_inode(struct super_block *sb) diff --git a/fs/proc/root.c b/fs/proc/root.c index f442967..e4b7c5a 100644 --- a/fs/proc/root.c +++ b/fs/proc/root.c @@ -97,9 +97,8 @@ void __init proc_root_init(void) err = register_filesystem(&proc_fs_type); if (err) return; - proc_mnt = kern_mount_data(&proc_fs_type, &init_pid_ns); - err = PTR_ERR(proc_mnt); - if (IS_ERR(proc_mnt)) { + err = pid_ns_prepare_proc(&init_pid_ns); + if (err) { unregister_filesystem(&proc_fs_type); return; } diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h index a5ab8ad..40da820 100644 --- a/include/linux/proc_fs.h +++ b/include/linux/proc_fs.h @@ -128,7 +128,6 @@ extern struct proc_dir_entry *create_proc_entry(const char *name, mode_t mode, struct proc_dir_entry *parent); extern void remove_proc_entry(const char *name, struct proc_dir_entry *parent); -extern struct vfsmount *proc_mnt; struct pid_namespace; extern int proc_fill_super(struct super_block *); extern struct inode *proc_get_inode(struct super_block *, unsigned int, struct proc_dir_entry *); -- 1.5.3.rc6.17.g1911 _______________________________________________ Containers mailing list Containers@xxxxxxxxxxxxxxxxxxxxxxxxxx https://lists.linux-foundation.org/mailman/listinfo/containers