android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

netfilter: nf_ct_tstamp: move initialization out of pernet_operations

Browse Source 
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>
This commit is contained in:
Gao feng
2013-01-21 22:10:27 +00:00
committed by Pablo Neira Ayuso
parent b7ff3a1fae
commit 73f4001a52
3 changed files with 45 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
include/net/netfilter/nf_conntrack_timestamp.h
View File

@ -48,15 +48,28 @@ static inline void nf_ct_set_tstamp(struct net *net, bool enable)
} }
#ifdef CONFIG_NF_CONNTRACK_TIMESTAMP #ifdef CONFIG_NF_CONNTRACK_TIMESTAMP
extern int nf_conntrack_tstamp_init(struct net *net); extern int nf_conntrack_tstamp_pernet_init(struct net *net);
extern void nf_conntrack_tstamp_fini(struct net *net); extern void nf_conntrack_tstamp_pernet_fini(struct net *net);
extern int nf_conntrack_tstamp_init(void);
extern void nf_conntrack_tstamp_fini(void);
#else #else
static inline int nf_conntrack_tstamp_init(struct net *net) static inline int nf_conntrack_tstamp_pernet_init(struct net *net)
{ {
return 0; return 0;
} }
static inline void nf_conntrack_tstamp_fini(struct net *net) static inline void nf_conntrack_tstamp_pernet_fini(struct net *net)
{
return;
}
static inline int nf_conntrack_tstamp_init(void)
{
return 0;
}
static inline void nf_conntrack_tstamp_fini(void)
{ {
return; return;
} }

15
net/netfilter/nf_conntrack_core.c
View File

@ -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_tstamp_fini();
nf_conntrack_acct_fini(); nf_conntrack_acct_fini();
nf_conntrack_expect_fini(); nf_conntrack_expect_fini();
} }
@ -1378,7 +1379,7 @@ void nf_conntrack_cleanup_net(struct net *net)
nf_conntrack_helper_fini(net); nf_conntrack_helper_fini(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_pernet_fini(net);
nf_conntrack_acct_pernet_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);
@ -1512,6 +1513,10 @@ int nf_conntrack_init_start(void)
if (ret < 0) if (ret < 0)
goto err_acct; goto err_acct;
ret = nf_conntrack_tstamp_init();
if (ret < 0)
goto err_tstamp;
#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)
@ -1529,8 +1534,10 @@ int nf_conntrack_init_start(void)
#ifdef CONFIG_NF_CONNTRACK_ZONES #ifdef CONFIG_NF_CONNTRACK_ZONES
err_extend: err_extend:
nf_conntrack_acct_fini(); nf_conntrack_tstamp_fini();
#endif #endif
err_tstamp:
nf_conntrack_acct_fini();
err_acct: err_acct:
nf_conntrack_expect_fini(); nf_conntrack_expect_fini();
err_expect: err_expect:
@ -1596,7 +1603,7 @@ int nf_conntrack_init_net(struct net *net)
ret = nf_conntrack_acct_pernet_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_pernet_init(net);
if (ret < 0) if (ret < 0)
goto err_tstamp; goto err_tstamp;
ret = nf_conntrack_ecache_init(net); ret = nf_conntrack_ecache_init(net);
@ -1627,7 +1634,7 @@ err_helper:
err_timeout: err_timeout:
nf_conntrack_ecache_fini(net); nf_conntrack_ecache_fini(net);
err_ecache: err_ecache:
nf_conntrack_tstamp_fini(net); nf_conntrack_tstamp_pernet_fini(net);
err_tstamp: err_tstamp:
nf_conntrack_acct_pernet_fini(net); nf_conntrack_acct_pernet_fini(net);
err_acct: err_acct:

43
net/netfilter/nf_conntrack_timestamp.c
View File

@ -88,37 +88,28 @@ static void nf_conntrack_tstamp_fini_sysctl(struct net *net)
} }
#endif #endif
int nf_conntrack_tstamp_init(struct net *net) int nf_conntrack_tstamp_pernet_init(struct net *net)
{
net->ct.sysctl_tstamp = nf_ct_tstamp;
return nf_conntrack_tstamp_init_sysctl(net);
}
void nf_conntrack_tstamp_pernet_fini(struct net *net)
{
nf_conntrack_tstamp_fini_sysctl(net);
nf_ct_extend_unregister(&tstamp_extend);
}
int nf_conntrack_tstamp_init(void)
{ {
int ret; int ret;
ret = nf_ct_extend_register(&tstamp_extend);
net->ct.sysctl_tstamp = nf_ct_tstamp;
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;
}
}
ret = nf_conntrack_tstamp_init_sysctl(net);
if (ret < 0) if (ret < 0)
goto out_sysctl; pr_err("nf_ct_tstamp: Unable to register extension\n");
return 0;
out_sysctl:
if (net_eq(net, &init_net))
nf_ct_extend_unregister(&tstamp_extend);
out_extend_register:
return ret; return ret;
} }
void nf_conntrack_tstamp_fini(struct net *net) void nf_conntrack_tstamp_fini(void)
{ {
nf_conntrack_tstamp_fini_sysctl(net); nf_ct_extend_unregister(&tstamp_extend);
if (net_eq(net, &init_net))
nf_ct_extend_unregister(&tstamp_extend);
} }