diff options
author | Adrian Bunk <bunk@kernel.org> | 2008-07-22 17:19:19 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-07-22 17:19:19 -0400 |
commit | 8086cd451f08f4c0f9693fc66d87754bbd18cfba (patch) | |
tree | 4cd564e413e6cd20905befa968361302e3ea2ec8 | |
parent | cf508b1211dbe576778ff445ea1b4b0bcfa5c4ea (diff) |
netns: make get_proc_net() static
get_proc_net() can now become static.
Signed-off-by: Adrian Bunk <bunk@kernel.org>
Acked-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | fs/proc/proc_net.c | 11 | ||||
-rw-r--r-- | include/linux/proc_fs.h | 2 |
2 files changed, 5 insertions, 8 deletions
diff --git a/fs/proc/proc_net.c b/fs/proc/proc_net.c index b224a28e0c15..7bc296f424ae 100644 --- a/fs/proc/proc_net.c +++ b/fs/proc/proc_net.c | |||
@@ -27,6 +27,11 @@ | |||
27 | #include "internal.h" | 27 | #include "internal.h" |
28 | 28 | ||
29 | 29 | ||
30 | static struct net *get_proc_net(const struct inode *inode) | ||
31 | { | ||
32 | return maybe_get_net(PDE_NET(PDE(inode))); | ||
33 | } | ||
34 | |||
30 | int seq_open_net(struct inode *ino, struct file *f, | 35 | int seq_open_net(struct inode *ino, struct file *f, |
31 | const struct seq_operations *ops, int size) | 36 | const struct seq_operations *ops, int size) |
32 | { | 37 | { |
@@ -185,12 +190,6 @@ void proc_net_remove(struct net *net, const char *name) | |||
185 | } | 190 | } |
186 | EXPORT_SYMBOL_GPL(proc_net_remove); | 191 | EXPORT_SYMBOL_GPL(proc_net_remove); |
187 | 192 | ||
188 | struct net *get_proc_net(const struct inode *inode) | ||
189 | { | ||
190 | return maybe_get_net(PDE_NET(PDE(inode))); | ||
191 | } | ||
192 | EXPORT_SYMBOL_GPL(get_proc_net); | ||
193 | |||
194 | static __net_init int proc_net_ns_init(struct net *net) | 193 | static __net_init int proc_net_ns_init(struct net *net) |
195 | { | 194 | { |
196 | struct proc_dir_entry *netd, *net_statd; | 195 | struct proc_dir_entry *netd, *net_statd; |
diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h index fff1d27ddb4c..15a9eaf4a802 100644 --- a/include/linux/proc_fs.h +++ b/include/linux/proc_fs.h | |||
@@ -305,8 +305,6 @@ static inline struct net *PDE_NET(struct proc_dir_entry *pde) | |||
305 | return pde->parent->data; | 305 | return pde->parent->data; |
306 | } | 306 | } |
307 | 307 | ||
308 | struct net *get_proc_net(const struct inode *inode); | ||
309 | |||
310 | struct proc_maps_private { | 308 | struct proc_maps_private { |
311 | struct pid *pid; | 309 | struct pid *pid; |
312 | struct task_struct *task; | 310 | struct task_struct *task; |