lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[NETNS]: Add namespace to API for routing /proc entries creation.

Browse Source 
This adds netns parameter to fib_proc_init/exit and replaces __init
specifier with __net_init. After this, we will not yet have these proc
files show info from the specific namespace - this will be done when
these tables become namespaced.

Acked-by: Benjamin Thery <benjamin.thery@bull.net>
Acked-by: Daniel Lezcano <dlezcano@fr.ibm.com>
Signed-off-by: Denis V. Lunev <den@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Denis V. Lunev
2008-01-10 03:21:09 -08:00
committed by David S. Miller
parent 5fd30ee7c4
commit 61a0265344
4 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/net/ip_fib.h
View File

@@ -253,8 +253,8 @@ static inline void fib_res_put(struct fib_result *res)
} }
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS
extern int fib_proc_init(void); extern int __net_init fib_proc_init(struct net *net);
extern void fib_proc_exit(void); extern void __net_exit fib_proc_exit(struct net *net);
#endif #endif
#endif /* _NET_FIB_H */ #endif /* _NET_FIB_H */

4
net/ipv4/af_inet.c
View File

@@ -1475,14 +1475,14 @@ static int __init ipv4_proc_init(void)
goto out_tcp; goto out_tcp;
if (udp4_proc_init()) if (udp4_proc_init())
goto out_udp; goto out_udp;
if (fib_proc_init()) if (fib_proc_init(&init_net))
goto out_fib; goto out_fib;
if (ip_misc_proc_init()) if (ip_misc_proc_init())
goto out_misc; goto out_misc;
out: out:
return rc; return rc;
out_misc: out_misc:
fib_proc_exit(); fib_proc_exit(&init_net);
out_fib: out_fib:
udp4_proc_exit(); udp4_proc_exit();
out_udp: out_udp:

8
net/ipv4/fib_hash.c
View File

@@ -1041,15 +1041,15 @@ static const struct file_operations fib_seq_fops = {
.release = seq_release_private, .release = seq_release_private,
}; };
int __init fib_proc_init(void) int __net_init fib_proc_init(struct net *net)
{ {
if (!proc_net_fops_create(&init_net, "route", S_IRUGO, &fib_seq_fops)) if (!proc_net_fops_create(net, "route", S_IRUGO, &fib_seq_fops))
return -ENOMEM; return -ENOMEM;
return 0; return 0;
} }
void __init fib_proc_exit(void) void __net_exit fib_proc_exit(struct net *net)
{ {
proc_net_remove(&init_net, "route"); proc_net_remove(net, "route");
} }
#endif /* CONFIG_PROC_FS */ #endif /* CONFIG_PROC_FS */

21
net/ipv4/fib_trie.c
View File

@@ -2508,32 +2508,33 @@ static const struct file_operations fib_route_fops = {
.release = seq_release_private, .release = seq_release_private,
}; };
int __init fib_proc_init(void) int __net_init fib_proc_init(struct net *net)
{ {
if (!proc_net_fops_create(&init_net, "fib_trie", S_IRUGO, &fib_trie_fops)) if (!proc_net_fops_create(net, "fib_trie", S_IRUGO, &fib_trie_fops))
goto out1; goto out1;
if (!proc_net_fops_create(&init_net, "fib_triestat", S_IRUGO, &fib_triestat_fops)) if (!proc_net_fops_create(net, "fib_triestat", S_IRUGO,
&fib_triestat_fops))
goto out2; goto out2;
if (!proc_net_fops_create(&init_net, "route", S_IRUGO, &fib_route_fops)) if (!proc_net_fops_create(net, "route", S_IRUGO, &fib_route_fops))
goto out3; goto out3;
return 0; return 0;
out3: out3:
proc_net_remove(&init_net, "fib_triestat"); proc_net_remove(net, "fib_triestat");
out2: out2:
proc_net_remove(&init_net, "fib_trie"); proc_net_remove(net, "fib_trie");
out1: out1:
return -ENOMEM; return -ENOMEM;
} }
void __init fib_proc_exit(void) void __net_exit fib_proc_exit(struct net *net)
{ {
proc_net_remove(&init_net, "fib_trie"); proc_net_remove(net, "fib_trie");
proc_net_remove(&init_net, "fib_triestat"); proc_net_remove(net, "fib_triestat");
proc_net_remove(&init_net, "route"); proc_net_remove(net, "route");
} }
#endif /* CONFIG_PROC_FS */ #endif /* CONFIG_PROC_FS */