Merge branch 'linus' into x86/urgent

[linux-2.6] / net / ipv6 / proc.c

diff --git a/net/ipv6/proc.c b/net/ipv6/proc.c
index 4b9d5a905725f64ed419a7b2dfc0d9beb1b5f460..f82f6074cf855340987e04c63d7df24e1058db88 100644 (file)
--- a/net/ipv6/proc.c
+++ b/net/ipv6/proc.c
@@ -7,8 +7,6 @@
  *             PROC file system.  This is very similar to the IPv4 version,
  *             except it reports the sockets in the INET6 address family.
  *
- * Version:    $Id: proc.c,v 1.17 2002/02/01 22:01:04 davem Exp $
- *
  * Authors:    David S. Miller (davem@caip.rutgers.edu)
  *             YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
  *
@@ -35,16 +33,18 @@ static struct proc_dir_entry *proc_net_devsnmp6;
 
 static int sockstat6_seq_show(struct seq_file *seq, void *v)
 {
+       struct net *net = seq->private;
+
        seq_printf(seq, "TCP6: inuse %d\n",
-                      sock_prot_inuse_get(&init_net, &tcpv6_prot));
+                      sock_prot_inuse_get(net, &tcpv6_prot));
        seq_printf(seq, "UDP6: inuse %d\n",
-                      sock_prot_inuse_get(&init_net, &udpv6_prot));
+                      sock_prot_inuse_get(net, &udpv6_prot));
        seq_printf(seq, "UDPLITE6: inuse %d\n",
-                       sock_prot_inuse_get(&init_net, &udplitev6_prot));
+                       sock_prot_inuse_get(net, &udplitev6_prot));
        seq_printf(seq, "RAW6: inuse %d\n",
-                      sock_prot_inuse_get(&init_net, &rawv6_prot));
+                      sock_prot_inuse_get(net, &rawv6_prot));
        seq_printf(seq, "FRAG6: inuse %d memory %d\n",
-                      ip6_frag_nqueues(&init_net), ip6_frag_mem(&init_net));
+                      ip6_frag_nqueues(net), ip6_frag_mem(net));
        return 0;
 }
 
@@ -183,7 +183,7 @@ static int snmp6_seq_show(struct seq_file *seq, void *v)
 
 static int sockstat6_seq_open(struct inode *inode, struct file *file)
 {
-       return single_open(file, sockstat6_seq_show, NULL);
+       return single_open_net(inode, file, sockstat6_seq_show);
 }
 
 static const struct file_operations sockstat6_seq_fops = {
@@ -191,7 +191,7 @@ static const struct file_operations sockstat6_seq_fops = {
        .open    = sockstat6_seq_open,
        .read    = seq_read,
        .llseek  = seq_lseek,
-       .release = single_release,
+       .release = single_release_net,
 };
 
 static int snmp6_seq_open(struct inode *inode, struct file *file)
@@ -214,19 +214,17 @@ int snmp6_register_dev(struct inet6_dev *idev)
        if (!idev || !idev->dev)
                return -EINVAL;
 
-       if (dev_net(idev->dev) != &init_net)
+       if (!net_eq(dev_net(idev->dev), &init_net))
                return 0;
 
        if (!proc_net_devsnmp6)
                return -ENOENT;
 
-       p = proc_create(idev->dev->name, S_IRUGO,
-                       proc_net_devsnmp6, &snmp6_seq_fops);
+       p = proc_create_data(idev->dev->name, S_IRUGO,
+                            proc_net_devsnmp6, &snmp6_seq_fops, idev);
        if (!p)
                return -ENOMEM;
 
-       p->data = idev;
-
        idev->stats.proc_dir_entry = p;
        return 0;
 }
@@ -243,27 +241,45 @@ int snmp6_unregister_dev(struct inet6_dev *idev)
        return 0;
 }
 
+static int ipv6_proc_init_net(struct net *net)
+{
+       if (!proc_net_fops_create(net, "sockstat6", S_IRUGO,
+                       &sockstat6_seq_fops))
+               return -ENOMEM;
+       return 0;
+}
+
+static void ipv6_proc_exit_net(struct net *net)
+{
+       proc_net_remove(net, "sockstat6");
+}
+
+static struct pernet_operations ipv6_proc_ops = {
+       .init = ipv6_proc_init_net,
+       .exit = ipv6_proc_exit_net,
+};
+
 int __init ipv6_misc_proc_init(void)
 {
        int rc = 0;
 
+       if (register_pernet_subsys(&ipv6_proc_ops))
+               goto proc_net_fail;
+
        if (!proc_net_fops_create(&init_net, "snmp6", S_IRUGO, &snmp6_seq_fops))
                goto proc_snmp6_fail;
 
        proc_net_devsnmp6 = proc_mkdir("dev_snmp6", init_net.proc_net);
        if (!proc_net_devsnmp6)
                goto proc_dev_snmp6_fail;
-
-       if (!proc_net_fops_create(&init_net, "sockstat6", S_IRUGO, &sockstat6_seq_fops))
-               goto proc_sockstat6_fail;
 out:
        return rc;
 
-proc_sockstat6_fail:
-       proc_net_remove(&init_net, "dev_snmp6");
 proc_dev_snmp6_fail:
        proc_net_remove(&init_net, "snmp6");
 proc_snmp6_fail:
+       unregister_pernet_subsys(&ipv6_proc_ops);
+proc_net_fail:
        rc = -ENOMEM;
        goto out;
 }
@@ -273,5 +289,6 @@ void ipv6_misc_proc_exit(void)
        proc_net_remove(&init_net, "sockstat6");
        proc_net_remove(&init_net, "dev_snmp6");
        proc_net_remove(&init_net, "snmp6");
+       unregister_pernet_subsys(&ipv6_proc_ops);
 }