proc 5/6: simplify network namespace lookup
PATCH 10/11 proc 5/6: simplify network namespace lookup
Quoted 1 line
From
55479bec2d997de7352a26902170857c81c007b0Mon Sep 17 00:00:00 2001
From: Eric W. Biederman <[email protected]>
Date: Wed, 19 Nov 2008 05:10:17 +0300
Subject: [PATCH 10/11] proc 5/6: simplify network namespace lookup
Since the network namespace is recorded in the superblock we don't need to remember it on
each directory under /proc/net.
Signed-off-by Eric W. Biederman <[email protected]>
Signed-off-by Alexey Dobriyan <[email protected]>
--- fs/proc/generic.c | 17 ----------------- fs/proc/proc_net.c | 13 ++++++++++--- include/linux/proc_fs.h | 5 ----- 3 files changed, 10 insertions(+), 25 deletions(-)
fs/proc/generic.c +0 -17
@@ -697,23 +697,6 @@ struct proc_dir_entry *proc_mkdir_mode(const char *name, mode_t mode,return ent; } -struct proc_dir_entry *proc_net_mkdir (struct net *net,const char *name, -struct proc_dir_entry *parent) -{ -struct proc_dir_entry *ent; - - ent =__proc_create (&parent, name,S_IFDIR |S_IRUGO |S_IXUGO ,2 ); -if (ent) { - ent->data = net; -if (proc_register (parent, ent) <0 ) { -kfree (ent); - ent =NULL ; - } - } -return ent; -} -EXPORT_SYMBOL_GPL (proc_net_mkdir); -struct proc_dir_entry *proc_mkdir (const char *name,struct proc_dir_entry *parent) {
fs/proc/proc_net.c +10 -3
@@ -30,7 +30,7 @@ static struct file_system_type proc_net_fs_type;static struct net *get_proc_net (const struct inode *inode) { -return maybe_get_net (PDE_NET (PDE (inode))); +return maybe_get_net (inode->i_sb->s_fs_info); } int seq_open_net(struct inode *ino, struct file *f,
@@ -211,6 +211,15 @@ struct proc_dir_entry *proc_net_fops_create(struct net *net, }EXPORT_SYMBOL_GPL (proc_net_fops_create); +struct proc_dir_entry *proc_net_mkdir (struct net *net,const char *name, +struct proc_dir_entry *parent) +{ +if (!parent) + parent = net->proc_net; +return proc_mkdir (name, parent); +} +EXPORT_SYMBOL_GPL (proc_net_mkdir); +void proc_net_remove (struct net *net,const char *name) {remove_proc_entry (name, net->proc_net);
@@ -305,8 +314,6 @@ static __net_init int proc_net_ns_init(struct net *net)if (!netd) goto out; - netd->data = net; - err = -EEXIST ; net_statd =proc_net_mkdir (net,"stat" , netd);if (!net_statd)
include/linux/proc_fs.h +0 -5
@@ -300,11 +300,6 @@ static inline struct proc_dir_entry *PDE(const struct inode *inode)return PROC_I (inode)->pde; } -static inline struct net *PDE_NET (struct proc_dir_entry *pde) -{ -return pde->parent->data; -} -struct proc_maps_private {struct pid *pid;struct task_struct *task;
Signature · 1 line
1.5.6.5