Commit b7ff3a1f authored by Gao feng's avatar Gao feng Committed by Pablo Neira Ayuso

netfilter: nf_ct_acct: move initialization out of pernet_operations

Move the global initial codes to the module_init/exit context.
Signed-off-by: default avatarGao feng <gaofeng@cn.fujitsu.com>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 83b4dbe1
...@@ -57,7 +57,9 @@ static inline void nf_ct_set_acct(struct net *net, bool enable) ...@@ -57,7 +57,9 @@ static inline void nf_ct_set_acct(struct net *net, bool enable)
net->ct.sysctl_acct = enable; net->ct.sysctl_acct = enable;
} }
extern int nf_conntrack_acct_init(struct net *net); extern int nf_conntrack_acct_pernet_init(struct net *net);
extern void nf_conntrack_acct_fini(struct net *net); extern void nf_conntrack_acct_pernet_fini(struct net *net);
extern int nf_conntrack_acct_init(void);
extern void nf_conntrack_acct_fini(void);
#endif /* _NF_CONNTRACK_ACCT_H */ #endif /* _NF_CONNTRACK_ACCT_H */
...@@ -106,36 +106,26 @@ static void nf_conntrack_acct_fini_sysctl(struct net *net) ...@@ -106,36 +106,26 @@ static void nf_conntrack_acct_fini_sysctl(struct net *net)
} }
#endif #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; net->ct.sysctl_acct = nf_ct_acct;
return nf_conntrack_acct_init_sysctl(net);
}
if (net_eq(net, &init_net)) { void nf_conntrack_acct_pernet_fini(struct net *net)
ret = nf_ct_extend_register(&acct_extend); {
if (ret < 0) { nf_conntrack_acct_fini_sysctl(net);
printk(KERN_ERR "nf_conntrack_acct: Unable to register extension\n"); }
goto out_extend_register;
}
}
ret = nf_conntrack_acct_init_sysctl(net); int nf_conntrack_acct_init(void)
{
int ret = nf_ct_extend_register(&acct_extend);
if (ret < 0) if (ret < 0)
goto out_sysctl; pr_err("nf_conntrack_acct: Unable to register extension\n");
return 0;
out_sysctl:
if (net_eq(net, &init_net))
nf_ct_extend_unregister(&acct_extend);
out_extend_register:
return ret; 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);
} }
...@@ -1348,6 +1348,7 @@ void nf_conntrack_cleanup_end(void) ...@@ -1348,6 +1348,7 @@ void nf_conntrack_cleanup_end(void)
#ifdef CONFIG_NF_CONNTRACK_ZONES #ifdef CONFIG_NF_CONNTRACK_ZONES
nf_ct_extend_unregister(&nf_ct_zone_extend); nf_ct_extend_unregister(&nf_ct_zone_extend);
#endif #endif
nf_conntrack_acct_fini();
nf_conntrack_expect_fini(); nf_conntrack_expect_fini();
} }
...@@ -1378,7 +1379,7 @@ void nf_conntrack_cleanup_net(struct net *net) ...@@ -1378,7 +1379,7 @@ void nf_conntrack_cleanup_net(struct net *net)
nf_conntrack_timeout_fini(net); nf_conntrack_timeout_fini(net);
nf_conntrack_ecache_fini(net); nf_conntrack_ecache_fini(net);
nf_conntrack_tstamp_fini(net); nf_conntrack_tstamp_fini(net);
nf_conntrack_acct_fini(net); nf_conntrack_acct_pernet_fini(net);
nf_conntrack_expect_pernet_fini(net); nf_conntrack_expect_pernet_fini(net);
kmem_cache_destroy(net->ct.nf_conntrack_cachep); kmem_cache_destroy(net->ct.nf_conntrack_cachep);
kfree(net->ct.slabname); kfree(net->ct.slabname);
...@@ -1507,6 +1508,10 @@ int nf_conntrack_init_start(void) ...@@ -1507,6 +1508,10 @@ int nf_conntrack_init_start(void)
if (ret < 0) if (ret < 0)
goto err_expect; goto err_expect;
ret = nf_conntrack_acct_init();
if (ret < 0)
goto err_acct;
#ifdef CONFIG_NF_CONNTRACK_ZONES #ifdef CONFIG_NF_CONNTRACK_ZONES
ret = nf_ct_extend_register(&nf_ct_zone_extend); ret = nf_ct_extend_register(&nf_ct_zone_extend);
if (ret < 0) if (ret < 0)
...@@ -1524,8 +1529,10 @@ int nf_conntrack_init_start(void) ...@@ -1524,8 +1529,10 @@ int nf_conntrack_init_start(void)
#ifdef CONFIG_NF_CONNTRACK_ZONES #ifdef CONFIG_NF_CONNTRACK_ZONES
err_extend: err_extend:
nf_conntrack_expect_fini(); nf_conntrack_acct_fini();
#endif #endif
err_acct:
nf_conntrack_expect_fini();
err_expect: err_expect:
return ret; return ret;
} }
...@@ -1586,7 +1593,7 @@ int nf_conntrack_init_net(struct net *net) ...@@ -1586,7 +1593,7 @@ int nf_conntrack_init_net(struct net *net)
ret = nf_conntrack_expect_pernet_init(net); ret = nf_conntrack_expect_pernet_init(net);
if (ret < 0) if (ret < 0)
goto err_expect; goto err_expect;
ret = nf_conntrack_acct_init(net); ret = nf_conntrack_acct_pernet_init(net);
if (ret < 0) if (ret < 0)
goto err_acct; goto err_acct;
ret = nf_conntrack_tstamp_init(net); ret = nf_conntrack_tstamp_init(net);
...@@ -1622,7 +1629,7 @@ int nf_conntrack_init_net(struct net *net) ...@@ -1622,7 +1629,7 @@ int nf_conntrack_init_net(struct net *net)
err_ecache: err_ecache:
nf_conntrack_tstamp_fini(net); nf_conntrack_tstamp_fini(net);
err_tstamp: err_tstamp:
nf_conntrack_acct_fini(net); nf_conntrack_acct_pernet_fini(net);
err_acct: err_acct:
nf_conntrack_expect_pernet_fini(net); nf_conntrack_expect_pernet_fini(net);
err_expect: err_expect:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment