netfilter: nf_ct_tstamp: move initialization out of pernet_operations

Move the global initial codes to the module_init/exit context.

Signed-off-by: Gao feng <gaofeng@cn.fujitsu.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

2 files changed, 26 insertions, 28 deletions

diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
index f4c6d4a06a1a..20ebfff0a47e 100644
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
@@ -1348,6 +1348,7 @@ void nf_conntrack_cleanup_end(void)
 #ifdef CONFIG_NF_CONNTRACK_ZONES
         nf_ct_extend_unregister(&nf_ct_zone_extend);
 #endif
+        nf_conntrack_tstamp_fini();
         nf_conntrack_acct_fini();
         nf_conntrack_expect_fini();
 }
@@ -1378,7 +1379,7 @@ void nf_conntrack_cleanup_net(struct net *net)
         nf_conntrack_helper_fini(net);
         nf_conntrack_timeout_fini(net);
         nf_conntrack_ecache_fini(net);
-        nf_conntrack_tstamp_fini(net);
+        nf_conntrack_tstamp_pernet_fini(net);
         nf_conntrack_acct_pernet_fini(net);
         nf_conntrack_expect_pernet_fini(net);
         kmem_cache_destroy(net->ct.nf_conntrack_cachep);
@@ -1512,6 +1513,10 @@ int nf_conntrack_init_start(void)
         if (ret < 0)
                 goto err_acct;
 
+        ret = nf_conntrack_tstamp_init();
+        if (ret < 0)
+                goto err_tstamp;
+
 #ifdef CONFIG_NF_CONNTRACK_ZONES
         ret = nf_ct_extend_register(&nf_ct_zone_extend);
         if (ret < 0)
@@ -1529,8 +1534,10 @@ int nf_conntrack_init_start(void)
 
 #ifdef CONFIG_NF_CONNTRACK_ZONES
 err_extend:
-        nf_conntrack_acct_fini();
+        nf_conntrack_tstamp_fini();
 #endif
+err_tstamp:
+        nf_conntrack_acct_fini();
 err_acct:
         nf_conntrack_expect_fini();
 err_expect:
@@ -1596,7 +1603,7 @@ int nf_conntrack_init_net(struct net *net)
         ret = nf_conntrack_acct_pernet_init(net);
         if (ret < 0)
                 goto err_acct;
-        ret = nf_conntrack_tstamp_init(net);
+        ret = nf_conntrack_tstamp_pernet_init(net);
         if (ret < 0)
                 goto err_tstamp;
         ret = nf_conntrack_ecache_init(net);
@@ -1627,7 +1634,7 @@ err_helper:
 err_timeout:
         nf_conntrack_ecache_fini(net);
 err_ecache:
-        nf_conntrack_tstamp_fini(net);
+        nf_conntrack_tstamp_pernet_fini(net);
 err_tstamp:
         nf_conntrack_acct_pernet_fini(net);
 err_acct:
diff --git a/net/netfilter/nf_conntrack_timestamp.c b/net/netfilter/nf_conntrack_timestamp.c
index 7ea8026f07c9..902fb0a6b38a 100644
--- a/net/netfilter/nf_conntrack_timestamp.c
+++ b/net/netfilter/nf_conntrack_timestamp.c
@@ -88,37 +88,28 @@ static void nf_conntrack_tstamp_fini_sysctl(struct net *net)
 }
 #endif
 
-int nf_conntrack_tstamp_init(struct net *net)
+int nf_conntrack_tstamp_pernet_init(struct net *net)
 {
-        int ret;
-
         net->ct.sysctl_tstamp = nf_ct_tstamp;
+        return nf_conntrack_tstamp_init_sysctl(net);
+}
 
-        if (net_eq(net, &init_net)) {
-                ret = nf_ct_extend_register(&tstamp_extend);
-                if (ret < 0) {
-                        printk(KERN_ERR "nf_ct_tstamp: Unable to register "
-                                        "extension\n");
-                        goto out_extend_register;
-                }
-        }
+void nf_conntrack_tstamp_pernet_fini(struct net *net)
+{
+        nf_conntrack_tstamp_fini_sysctl(net);
+        nf_ct_extend_unregister(&tstamp_extend);
+}
 
-        ret = nf_conntrack_tstamp_init_sysctl(net);
+int nf_conntrack_tstamp_init(void)
+{
+        int ret;
+        ret = nf_ct_extend_register(&tstamp_extend);
         if (ret < 0)
-                goto out_sysctl;
-
-        return 0;
-
-out_sysctl:
-        if (net_eq(net, &init_net))
-                nf_ct_extend_unregister(&tstamp_extend);
-out_extend_register:
+                pr_err("nf_ct_tstamp: Unable to register extension\n");
         return ret;
 }
 
-void nf_conntrack_tstamp_fini(struct net *net)
+void nf_conntrack_tstamp_fini(void)
 {
-        nf_conntrack_tstamp_fini_sysctl(net);
-        if (net_eq(net, &init_net))
-                nf_ct_extend_unregister(&tstamp_extend);
+        nf_ct_extend_unregister(&tstamp_extend);
 }