diff options
author | Pavel Emelyanov <xemul@openvz.org> | 2008-03-24 17:56:02 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-03-24 17:56:02 -0400 |
commit | 757764f61d07ab8ff84699b6d608eac7bc94cecc (patch) | |
tree | 63d9e16a8aedab764a28cecc9e1c3716d5510137 /net/ipv4/tcp_ipv4.c | |
parent | 15439febb0bd530f85e40ad6fa8e9f75106639ef (diff) |
[NETNS][TCP]: Register /proc/net/tcp in a namespace.
After the commit f40c8174d3c21bf178283f3ef3aa8c7bf238fdec ([NETNS][IPV4]
tcp - make proc handle the network namespaces) it is now possible to make
this file present in newly created namespaces.
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp_ipv4.c')
-rw-r--r-- | net/ipv4/tcp_ipv4.c | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index 1a47719a55ad..649d00a50cb1 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c | |||
@@ -2425,14 +2425,29 @@ static struct tcp_seq_afinfo tcp4_seq_afinfo = { | |||
2425 | .seq_fops = &tcp4_seq_fops, | 2425 | .seq_fops = &tcp4_seq_fops, |
2426 | }; | 2426 | }; |
2427 | 2427 | ||
2428 | static int tcp4_proc_init_net(struct net *net) | ||
2429 | { | ||
2430 | return tcp_proc_register(net, &tcp4_seq_afinfo); | ||
2431 | } | ||
2432 | |||
2433 | static void tcp4_proc_exit_net(struct net *net) | ||
2434 | { | ||
2435 | tcp_proc_unregister(net, &tcp4_seq_afinfo); | ||
2436 | } | ||
2437 | |||
2438 | static struct pernet_operations tcp4_net_ops = { | ||
2439 | .init = tcp4_proc_init_net, | ||
2440 | .exit = tcp4_proc_exit_net, | ||
2441 | }; | ||
2442 | |||
2428 | int __init tcp4_proc_init(void) | 2443 | int __init tcp4_proc_init(void) |
2429 | { | 2444 | { |
2430 | return tcp_proc_register(&init_net, &tcp4_seq_afinfo); | 2445 | return register_pernet_subsys(&tcp4_net_ops); |
2431 | } | 2446 | } |
2432 | 2447 | ||
2433 | void tcp4_proc_exit(void) | 2448 | void tcp4_proc_exit(void) |
2434 | { | 2449 | { |
2435 | tcp_proc_unregister(&init_net, &tcp4_seq_afinfo); | 2450 | unregister_pernet_subsys(&tcp4_net_ops); |
2436 | } | 2451 | } |
2437 | #endif /* CONFIG_PROC_FS */ | 2452 | #endif /* CONFIG_PROC_FS */ |
2438 | 2453 | ||