From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755445Ab1AaKZw (ORCPT ); Mon, 31 Jan 2011 05:25:52 -0500 Received: from mtagate1.uk.ibm.com ([194.196.100.161]:43270 "EHLO mtagate1.uk.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755345Ab1AaKZk (ORCPT ); Mon, 31 Jan 2011 05:25:40 -0500 From: Daniel Lezcano To: akpm@linux-foundation.org Cc: ebiederm@xmission.com, oleg@redhat.com, containers@lists.linux-foundation.org, linux-kernel@vger.kernel.org, clg@fr.ibm.com Subject: [PATCH 3/4] procfs: kill the global proc_mnt variable Date: Mon, 31 Jan 2011 11:25:24 +0100 Message-Id: <1296469525-30111-4-git-send-email-daniel.lezcano@free.fr> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1296469525-30111-1-git-send-email-daniel.lezcano@free.fr> References: <1296469525-30111-1-git-send-email-daniel.lezcano@free.fr> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Oleg Nesterov After the previous cleanup in proc_get_sb() the global proc_mnt has no reasons to exists, kill it. Signed-off-by: Oleg Nesterov Signed-off-by: Eric W. Biederman Signed-off-by: Daniel Lezcano --- fs/proc/inode.c | 2 -- fs/proc/internal.h | 1 - fs/proc/root.c | 7 ++++--- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/fs/proc/inode.c b/fs/proc/inode.c index 176ce4c..ee0f802 100644 --- a/fs/proc/inode.c +++ b/fs/proc/inode.c @@ -42,8 +42,6 @@ static void proc_evict_inode(struct inode *inode) sysctl_head_put(PROC_I(inode)->sysctl); } -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/internal.h b/fs/proc/internal.h index 9ad561d..c03e8d3 100644 --- a/fs/proc/internal.h +++ b/fs/proc/internal.h @@ -107,7 +107,6 @@ static inline struct proc_dir_entry *pde_get(struct proc_dir_entry *pde) } void pde_put(struct proc_dir_entry *pde); -extern struct vfsmount *proc_mnt; int proc_fill_super(struct super_block *); struct inode *proc_get_inode(struct super_block *, struct proc_dir_entry *); diff --git a/fs/proc/root.c b/fs/proc/root.c index e5e2bfa..a9000e9 100644 --- a/fs/proc/root.c +++ b/fs/proc/root.c @@ -90,19 +90,20 @@ static struct file_system_type proc_fs_type = { void __init proc_root_init(void) { + struct vfsmount *mnt; int err; proc_init_inodecache(); err = register_filesystem(&proc_fs_type); if (err) return; - proc_mnt = kern_mount_data(&proc_fs_type, &init_pid_ns); - if (IS_ERR(proc_mnt)) { + mnt = kern_mount_data(&proc_fs_type, &init_pid_ns); + if (IS_ERR(mnt)) { unregister_filesystem(&proc_fs_type); return; } - init_pid_ns.proc_mnt = proc_mnt; + init_pid_ns.proc_mnt = mnt; proc_symlink("mounts", NULL, "self/mounts"); proc_net_init(); -- 1.7.1