Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / net / netfilter / nf_conntrack_acct.c

diff --git a/net/netfilter/nf_conntrack_acct.c b/net/netfilter/nf_conntrack_acct.c
index 7df424e2d10cf6146e7c3b38eaf0bf86a2bb0544..2d3030ab5b619c1a354ec328acf2e85bfd6fd250 100644 (file)
--- a/net/netfilter/nf_conntrack_acct.c
+++ b/net/netfilter/nf_conntrack_acct.c
@@ -106,36 +106,26 @@ static void nf_conntrack_acct_fini_sysctl(struct net *net)
 }
 #endif
 
-int nf_conntrack_acct_init(struct net *net)
+int nf_conntrack_acct_pernet_init(struct net *net)
 {
-       int ret;
-
        net->ct.sysctl_acct = nf_ct_acct;
+       return nf_conntrack_acct_init_sysctl(net);
+}
 
-       if (net_eq(net, &init_net)) {
-               ret = nf_ct_extend_register(&acct_extend);
-               if (ret < 0) {
-                       printk(KERN_ERR "nf_conntrack_acct: Unable to register extension\n");
-                       goto out_extend_register;
-               }
-       }
+void nf_conntrack_acct_pernet_fini(struct net *net)
+{
+       nf_conntrack_acct_fini_sysctl(net);
+}
 
-       ret = nf_conntrack_acct_init_sysctl(net);
+int nf_conntrack_acct_init(void)
+{
+       int ret = nf_ct_extend_register(&acct_extend);
        if (ret < 0)
-               goto out_sysctl;
-
-       return 0;
-
-out_sysctl:
-       if (net_eq(net, &init_net))
-               nf_ct_extend_unregister(&acct_extend);
-out_extend_register:
+               pr_err("nf_conntrack_acct: Unable to register extension\n");
        return ret;
 }
 
-void nf_conntrack_acct_fini(struct net *net)
+void nf_conntrack_acct_fini(void)
 {
-       nf_conntrack_acct_fini_sysctl(net);
-       if (net_eq(net, &init_net))
-               nf_ct_extend_unregister(&acct_extend);
+       nf_ct_extend_unregister(&acct_extend);
 }