1 files changed, 67 insertions, 54 deletions

diff --git a/net/ipv6/proc.c b/net/ipv6/proc.c
index 0179b66864f1..07f0b76e7427 100644
--- a/net/ipv6/proc.c
+++ b/net/ipv6/proc.c
@@ -29,8 +29,6 @@
 #include <net/transp_v6.h>
 #include <net/ipv6.h>
 
-static struct proc_dir_entry *proc_net_devsnmp6;
-
 static int sockstat6_seq_show(struct seq_file *seq, void *v)
 {
         struct net *net = seq->private;
@@ -48,6 +46,19 @@ static int sockstat6_seq_show(struct seq_file *seq, void *v)
         return 0;
 }
 
+static int sockstat6_seq_open(struct inode *inode, struct file *file)
+{
+        return single_open_net(inode, file, sockstat6_seq_show);
+}
+
+static const struct file_operations sockstat6_seq_fops = {
+        .owner   = THIS_MODULE,
+        .open    = sockstat6_seq_open,
+        .read    = seq_read,
+        .llseek  = seq_lseek,
+        .release = single_release_net,
+};
+
 static struct snmp_mib snmp6_ipstats_list[] = {
 /* ipv6 mib according to RFC 2465 */
         SNMP_MIB_ITEM("Ip6InReceives", IPSTATS_MIB_INRECEIVES),
@@ -164,44 +175,52 @@ snmp6_seq_show_item(struct seq_file *seq, void **mib, struct snmp_mib *itemlist)
 
 static int snmp6_seq_show(struct seq_file *seq, void *v)
 {
-        struct inet6_dev *idev = (struct inet6_dev *)seq->private;
-
-        if (idev) {
-                seq_printf(seq, "%-32s\t%u\n", "ifIndex", idev->dev->ifindex);
-                snmp6_seq_show_item(seq, (void **)idev->stats.ipv6, snmp6_ipstats_list);
-                snmp6_seq_show_item(seq, (void **)idev->stats.icmpv6, snmp6_icmp6_list);
-                snmp6_seq_show_icmpv6msg(seq, (void **)idev->stats.icmpv6msg);
-        } else {
-                snmp6_seq_show_item(seq, (void **)ipv6_statistics, snmp6_ipstats_list);
-                snmp6_seq_show_item(seq, (void **)icmpv6_statistics, snmp6_icmp6_list);
-                snmp6_seq_show_icmpv6msg(seq, (void **)icmpv6msg_statistics);
-                snmp6_seq_show_item(seq, (void **)udp_stats_in6, snmp6_udp6_list);
-                snmp6_seq_show_item(seq, (void **)udplite_stats_in6, snmp6_udplite6_list);
-        }
+        struct net *net = (struct net *)seq->private;
+
+        snmp6_seq_show_item(seq, (void **)net->mib.ipv6_statistics,
+                            snmp6_ipstats_list);
+        snmp6_seq_show_item(seq, (void **)net->mib.icmpv6_statistics,
+                            snmp6_icmp6_list);
+        snmp6_seq_show_icmpv6msg(seq, (void **)net->mib.icmpv6msg_statistics);
+        snmp6_seq_show_item(seq, (void **)net->mib.udp_stats_in6,
+                            snmp6_udp6_list);
+        snmp6_seq_show_item(seq, (void **)net->mib.udplite_stats_in6,
+                            snmp6_udplite6_list);
         return 0;
 }
 
-static int sockstat6_seq_open(struct inode *inode, struct file *file)
+static int snmp6_seq_open(struct inode *inode, struct file *file)
 {
-        return single_open_net(inode, file, sockstat6_seq_show);
+        return single_open_net(inode, file, snmp6_seq_show);
 }
 
-static const struct file_operations sockstat6_seq_fops = {
+static const struct file_operations snmp6_seq_fops = {
         .owner   = THIS_MODULE,
-        .open    = sockstat6_seq_open,
+        .open    = snmp6_seq_open,
         .read    = seq_read,
         .llseek  = seq_lseek,
         .release = single_release_net,
 };
 
-static int snmp6_seq_open(struct inode *inode, struct file *file)
+static int snmp6_dev_seq_show(struct seq_file *seq, void *v)
 {
-        return single_open(file, snmp6_seq_show, PDE(inode)->data);
+        struct inet6_dev *idev = (struct inet6_dev *)seq->private;
+
+        seq_printf(seq, "%-32s\t%u\n", "ifIndex", idev->dev->ifindex);
+        snmp6_seq_show_item(seq, (void **)idev->stats.ipv6, snmp6_ipstats_list);
+        snmp6_seq_show_item(seq, (void **)idev->stats.icmpv6, snmp6_icmp6_list);
+        snmp6_seq_show_icmpv6msg(seq, (void **)idev->stats.icmpv6msg);
+        return 0;
 }
 
-static const struct file_operations snmp6_seq_fops = {
+static int snmp6_dev_seq_open(struct inode *inode, struct file *file)
+{
+        return single_open(file, snmp6_dev_seq_show, PDE(inode)->data);
+}
+
+static const struct file_operations snmp6_dev_seq_fops = {
         .owner   = THIS_MODULE,
-        .open    = snmp6_seq_open,
+        .open    = snmp6_dev_seq_open,
         .read    = seq_read,
         .llseek  = seq_lseek,
         .release = single_release,
@@ -210,18 +229,18 @@ static const struct file_operations snmp6_seq_fops = {
 int snmp6_register_dev(struct inet6_dev *idev)
 {
         struct proc_dir_entry *p;
+        struct net *net;
 
         if (!idev || !idev->dev)
                 return -EINVAL;
 
-        if (!net_eq(dev_net(idev->dev), &init_net))
-                return 0;
-
-        if (!proc_net_devsnmp6)
+        net = dev_net(idev->dev);
+        if (!net->mib.proc_net_devsnmp6)
                 return -ENOENT;
 
         p = proc_create_data(idev->dev->name, S_IRUGO,
-                             proc_net_devsnmp6, &snmp6_seq_fops, idev);
+                             net->mib.proc_net_devsnmp6,
+                             &snmp6_dev_seq_fops, idev);
         if (!p)
                 return -ENOMEM;
 
@@ -231,12 +250,13 @@ int snmp6_register_dev(struct inet6_dev *idev)
 
 int snmp6_unregister_dev(struct inet6_dev *idev)
 {
-        if (!proc_net_devsnmp6)
+        struct net *net = dev_net(idev->dev);
+        if (!net->mib.proc_net_devsnmp6)
                 return -ENOENT;
         if (!idev || !idev->stats.proc_dir_entry)
                 return -EINVAL;
         remove_proc_entry(idev->stats.proc_dir_entry->name,
-                          proc_net_devsnmp6);
+                          net->mib.proc_net_devsnmp6);
         idev->stats.proc_dir_entry = NULL;
         return 0;
 }
@@ -246,12 +266,27 @@ static int ipv6_proc_init_net(struct net *net)
         if (!proc_net_fops_create(net, "sockstat6", S_IRUGO,
                         &sockstat6_seq_fops))
                 return -ENOMEM;
+
+        if (!proc_net_fops_create(net, "snmp6", S_IRUGO, &snmp6_seq_fops))
+                goto proc_snmp6_fail;
+
+        net->mib.proc_net_devsnmp6 = proc_mkdir("dev_snmp6", net->proc_net);
+        if (!net->mib.proc_net_devsnmp6)
+                goto proc_dev_snmp6_fail;
         return 0;
+
+proc_snmp6_fail:
+        proc_net_remove(net, "sockstat6");
+proc_dev_snmp6_fail:
+        proc_net_remove(net, "dev_snmp6");
+        return -ENOMEM;
 }
 
 static void ipv6_proc_exit_net(struct net *net)
 {
         proc_net_remove(net, "sockstat6");
+        proc_net_remove(net, "dev_snmp6");
+        proc_net_remove(net, "snmp6");
 }
 
 static struct pernet_operations ipv6_proc_ops = {
@@ -261,33 +296,11 @@ static struct pernet_operations ipv6_proc_ops = {
 
 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;
-out:
-        return rc;
-
-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;
+        return register_pernet_subsys(&ipv6_proc_ops);
 }
 
 void ipv6_misc_proc_exit(void)
 {
-        proc_net_remove(&init_net, "dev_snmp6");
-        proc_net_remove(&init_net, "snmp6");
         unregister_pernet_subsys(&ipv6_proc_ops);
 }