diff options
Diffstat (limited to 'fs')
-rw-r--r-- | fs/proc/proc_net.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/fs/proc/proc_net.c b/fs/proc/proc_net.c index cfc4f6c072f1..4823c9677fac 100644 --- a/fs/proc/proc_net.c +++ b/fs/proc/proc_net.c | |||
@@ -96,6 +96,17 @@ static struct proc_dir_entry *proc_net_shadow(struct task_struct *task, | |||
96 | return task->nsproxy->net_ns->proc_net; | 96 | return task->nsproxy->net_ns->proc_net; |
97 | } | 97 | } |
98 | 98 | ||
99 | struct proc_dir_entry *proc_net_mkdir(struct net *net, const char *name, | ||
100 | struct proc_dir_entry *parent) | ||
101 | { | ||
102 | struct proc_dir_entry *pde; | ||
103 | pde = proc_mkdir_mode(name, S_IRUGO | S_IXUGO, parent); | ||
104 | if (pde != NULL) | ||
105 | pde->data = net; | ||
106 | return pde; | ||
107 | } | ||
108 | EXPORT_SYMBOL_GPL(proc_net_mkdir); | ||
109 | |||
99 | static __net_init int proc_net_ns_init(struct net *net) | 110 | static __net_init int proc_net_ns_init(struct net *net) |
100 | { | 111 | { |
101 | struct proc_dir_entry *root, *netd, *net_statd; | 112 | struct proc_dir_entry *root, *netd, *net_statd; |
@@ -107,18 +118,16 @@ static __net_init int proc_net_ns_init(struct net *net) | |||
107 | goto out; | 118 | goto out; |
108 | 119 | ||
109 | err = -EEXIST; | 120 | err = -EEXIST; |
110 | netd = proc_mkdir("net", root); | 121 | netd = proc_net_mkdir(net, "net", root); |
111 | if (!netd) | 122 | if (!netd) |
112 | goto free_root; | 123 | goto free_root; |
113 | 124 | ||
114 | err = -EEXIST; | 125 | err = -EEXIST; |
115 | net_statd = proc_mkdir("stat", netd); | 126 | net_statd = proc_net_mkdir(net, "stat", netd); |
116 | if (!net_statd) | 127 | if (!net_statd) |
117 | goto free_net; | 128 | goto free_net; |
118 | 129 | ||
119 | root->data = net; | 130 | root->data = net; |
120 | netd->data = net; | ||
121 | net_statd->data = net; | ||
122 | 131 | ||
123 | net->proc_net_root = root; | 132 | net->proc_net_root = root; |
124 | net->proc_net = netd; | 133 | net->proc_net = netd; |