]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[NETNS][TCP]: Register /proc/net/tcp in a namespace.
authorPavel Emelyanov <xemul@openvz.org>
Mon, 24 Mar 2008 21:56:02 +0000 (14:56 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 24 Mar 2008 21:56:02 +0000 (14:56 -0700)
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>
net/ipv4/tcp_ipv4.c

index 1a47719a55ad87fe876f99470125ae626c2f6b15..649d00a50cb16489952d276417b71ca7d9e5fd9c 100644 (file)
@@ -2425,14 +2425,29 @@ static struct tcp_seq_afinfo tcp4_seq_afinfo = {
        .seq_fops       = &tcp4_seq_fops,
 };
 
+static int tcp4_proc_init_net(struct net *net)
+{
+       return tcp_proc_register(net, &tcp4_seq_afinfo);
+}
+
+static void tcp4_proc_exit_net(struct net *net)
+{
+       tcp_proc_unregister(net, &tcp4_seq_afinfo);
+}
+
+static struct pernet_operations tcp4_net_ops = {
+       .init = tcp4_proc_init_net,
+       .exit = tcp4_proc_exit_net,
+};
+
 int __init tcp4_proc_init(void)
 {
-       return tcp_proc_register(&init_net, &tcp4_seq_afinfo);
+       return register_pernet_subsys(&tcp4_net_ops);
 }
 
 void tcp4_proc_exit(void)
 {
-       tcp_proc_unregister(&init_net, &tcp4_seq_afinfo);
+       unregister_pernet_subsys(&tcp4_net_ops);
 }
 #endif /* CONFIG_PROC_FS */