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

Commit 8684094c authored by Gao feng's avatar Gao feng Committed by Pablo Neira Ayuso
Browse files

netfilter: nf_ct_timeout: 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 3fe0f943

include/net/netfilter/nf_conntrack_timeout.h

+4 −4
Original line number Diff line number Diff line
@@ -76,15 +76,15 @@ nf_ct_timeout_lookup(struct net *net, struct nf_conn *ct, 
}



#ifdef CONFIG_NF_CONNTRACK_TIMEOUT

extern int nf_conntrack_timeout_init(struct net *net);

extern void nf_conntrack_timeout_fini(struct net *net);

extern int nf_conntrack_timeout_init(void);

extern void nf_conntrack_timeout_fini(void);

#else

static inline int nf_conntrack_timeout_init(struct net *net)

static inline int nf_conntrack_timeout_init(void)

{

        return 0;

}



static inline void nf_conntrack_timeout_fini(struct net *net)

static inline void nf_conntrack_timeout_fini(void)

{

        return;

}

net/netfilter/nf_conntrack_core.c

+8 −7
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_timeout_fini();

	nf_conntrack_ecache_fini();

	nf_conntrack_tstamp_fini();

	nf_conntrack_acct_fini();
@@ -1378,7 +1379,6 @@ void nf_conntrack_cleanup_net(struct net *net) 
	nf_conntrack_proto_fini(net);

	nf_conntrack_labels_fini(net);

	nf_conntrack_helper_fini(net);

	nf_conntrack_timeout_fini(net);

	nf_conntrack_ecache_pernet_fini(net);

	nf_conntrack_tstamp_pernet_fini(net);

	nf_conntrack_acct_pernet_fini(net);
@@ -1522,6 +1522,10 @@ int nf_conntrack_init_start(void) 
	if (ret < 0)

		goto err_ecache;



	ret = nf_conntrack_timeout_init();

	if (ret < 0)

		goto err_timeout;



#ifdef CONFIG_NF_CONNTRACK_ZONES

	ret = nf_ct_extend_register(&nf_ct_zone_extend);

	if (ret < 0)
@@ -1539,8 +1543,10 @@ int nf_conntrack_init_start(void) 


#ifdef CONFIG_NF_CONNTRACK_ZONES

err_extend:

	nf_conntrack_ecache_fini();

	nf_conntrack_timeout_fini();

#endif

err_timeout:

	nf_conntrack_ecache_fini();

err_ecache:

	nf_conntrack_tstamp_fini();

err_tstamp:
@@ -1616,9 +1622,6 @@ int nf_conntrack_init_net(struct net *net) 
	ret = nf_conntrack_ecache_pernet_init(net);

	if (ret < 0)

		goto err_ecache;

	ret = nf_conntrack_timeout_init(net);

	if (ret < 0)

		goto err_timeout;

	ret = nf_conntrack_helper_init(net);

	if (ret < 0)

		goto err_helper;
@@ -1637,8 +1640,6 @@ int nf_conntrack_init_net(struct net *net) 
err_labels:

	nf_conntrack_helper_fini(net);

err_helper:

	nf_conntrack_timeout_fini(net);

err_timeout:

	nf_conntrack_ecache_pernet_fini(net);

err_ecache:

	nf_conntrack_tstamp_pernet_fini(net);

net/netfilter/nf_conntrack_timeout.c

+7 −16
Original line number Diff line number Diff line
@@ -37,24 +37,15 @@ static struct nf_ct_ext_type timeout_extend __read_mostly = { 
	.id	= NF_CT_EXT_TIMEOUT,

};



int nf_conntrack_timeout_init(struct net *net)

int nf_conntrack_timeout_init(void)

{

	int ret = 0;



	if (net_eq(net, &init_net)) {

		ret = nf_ct_extend_register(&timeout_extend);

		if (ret < 0) {

			printk(KERN_ERR "nf_ct_timeout: Unable to register "

					"timeout extension.\n");

	int ret = nf_ct_extend_register(&timeout_extend);

	if (ret < 0)

		pr_err("nf_ct_timeout: Unable to register timeout extension.\n");

	return ret;

}

	}



	return 0;

}



void nf_conntrack_timeout_fini(struct net *net)

void nf_conntrack_timeout_fini(void)

{

	if (net_eq(net, &init_net))

	nf_ct_extend_unregister(&timeout_extend);

}