Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 73f4001a authored by Gao feng's avatar Gao feng Committed by Pablo Neira Ayuso
Browse files

netfilter: nf_ct_tstamp: 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 b7ff3a1f

include/net/netfilter/nf_conntrack_timestamp.h

+17 −4
Original line number Diff line number Diff line
@@ -48,15 +48,28 @@ static inline void nf_ct_set_tstamp(struct net *net, bool enable) 
}



#ifdef CONFIG_NF_CONNTRACK_TIMESTAMP

extern int nf_conntrack_tstamp_init(struct net *net);

extern void nf_conntrack_tstamp_fini(struct net *net);

extern int nf_conntrack_tstamp_pernet_init(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

static inline int nf_conntrack_tstamp_init(struct net *net)

static inline int nf_conntrack_tstamp_pernet_init(struct net *net)

{

	return 0;

}



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(struct net *net)

static inline void nf_conntrack_tstamp_fini(void)

{

	return;

}

net/netfilter/nf_conntrack_core.c

+11 −4
Original line number Diff line number Diff line
@@ -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:

net/netfilter/nf_conntrack_timestamp.c

+15 −24
Original line number Diff line number Diff line
@@ -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;



	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;

	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);

}



	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);

}