Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932065Ab1BOSuV (ORCPT ); Tue, 15 Feb 2011 13:50:21 -0500 Received: from adelie.canonical.com ([91.189.90.139]:36192 "EHLO adelie.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752100Ab1BOSuS (ORCPT ); Tue, 15 Feb 2011 13:50:18 -0500 Date: Tue, 15 Feb 2011 12:50:02 -0600 From: "Serge E. Hallyn" To: Daniel Lezcano Cc: akpm@linux-foundation.org, containers@lists.linux-foundation.org, ebiederm@xmission.com, linux-kernel@vger.kernel.org, oleg@redhat.com Subject: Re: [PATCH 3/3] procfs: kill the global proc_mnt variable Message-ID: <20110215185002.GC16364@localhost> References: <1297710963-19843-1-git-send-email-daniel.lezcano@free.fr> <1297710963-19843-4-git-send-email-daniel.lezcano@free.fr> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1297710963-19843-4-git-send-email-daniel.lezcano@free.fr> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2636 Lines: 83 Quoting Daniel Lezcano (daniel.lezcano@free.fr): > 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 Acked-by: Serge E. Hallyn > --- > 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 > > _______________________________________________ > Containers mailing list > Containers@lists.linux-foundation.org > https://lists.linux-foundation.org/mailman/listinfo/containers -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/