netfilter: conntrack: remove empty pernet fini stubs

Florian Westphal · ummakynes · commit fc3893fd5cfc · 2018-12-21T00:51:54.000+01:00
after moving sysctl handling into single place, the init functions
can't fail anymore and some of the fini functions are empty.

Remove them and change return type to void.
This also simplifies error unwinding in conntrack module init path.

Signed-off-by: Florian Westphal &lt;fw@strlen.de&gt;
Signed-off-by: Pablo Neira Ayuso &lt;pablo@netfilter.org&gt;
diff --git a/include/net/netfilter/nf_conntrack_acct.h b/include/net/netfilter/nf_conntrack_acct.h
@@ -58,8 +58,7 @@ static inline void nf_ct_set_acct(struct net *net, bool enable)
 	net->ct.sysctl_acct = enable;
 }
 
-int nf_conntrack_acct_pernet_init(struct net *net);
-void nf_conntrack_acct_pernet_fini(struct net *net);
+void nf_conntrack_acct_pernet_init(struct net *net);
 
 int nf_conntrack_acct_init(void);
 void nf_conntrack_acct_fini(void);
diff --git a/include/net/netfilter/nf_conntrack_ecache.h b/include/net/netfilter/nf_conntrack_ecache.h
@@ -142,7 +142,7 @@ void nf_ct_expect_event_report(enum ip_conntrack_expect_events event,
 			       struct nf_conntrack_expect *exp,
 			       u32 portid, int report);
 
-int nf_conntrack_ecache_pernet_init(struct net *net);
+void nf_conntrack_ecache_pernet_init(struct net *net);
 void nf_conntrack_ecache_pernet_fini(struct net *net);
 
 int nf_conntrack_ecache_init(void);
@@ -182,10 +182,7 @@ static inline void nf_ct_expect_event_report(enum ip_conntrack_expect_events e,
  					     u32 portid,
  					     int report) {}
 
-static inline int nf_conntrack_ecache_pernet_init(struct net *net)
-{
-	return 0;
-}
+static inline void nf_conntrack_ecache_pernet_init(struct net *net) {}
 
 static inline void nf_conntrack_ecache_pernet_fini(struct net *net)
 {
diff --git a/include/net/netfilter/nf_conntrack_helper.h b/include/net/netfilter/nf_conntrack_helper.h
@@ -124,8 +124,7 @@ static inline void *nfct_help_data(const struct nf_conn *ct)
 	return (void *)help->data;
 }
 
-int nf_conntrack_helper_pernet_init(struct net *net);
-void nf_conntrack_helper_pernet_fini(struct net *net);
+void nf_conntrack_helper_pernet_init(struct net *net);
 
 int nf_conntrack_helper_init(void);
 void nf_conntrack_helper_fini(void);
diff --git a/include/net/netfilter/nf_conntrack_timestamp.h b/include/net/netfilter/nf_conntrack_timestamp.h
@@ -49,21 +49,12 @@ static inline void nf_ct_set_tstamp(struct net *net, bool enable)
 }
 
 #ifdef CONFIG_NF_CONNTRACK_TIMESTAMP
-int nf_conntrack_tstamp_pernet_init(struct net *net);
-void nf_conntrack_tstamp_pernet_fini(struct net *net);
+void nf_conntrack_tstamp_pernet_init(struct net *net);
 
 int nf_conntrack_tstamp_init(void);
 void nf_conntrack_tstamp_fini(void);
 #else
-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 void nf_conntrack_tstamp_pernet_init(struct net *net) {}
 
 static inline int nf_conntrack_tstamp_init(void)
 {
diff --git a/net/netfilter/nf_conntrack_acct.c b/net/netfilter/nf_conntrack_acct.c
@@ -31,14 +31,9 @@ static const struct nf_ct_ext_type acct_extend = {
 	.id	= NF_CT_EXT_ACCT,
 };
 
-int nf_conntrack_acct_pernet_init(struct net *net)
+void nf_conntrack_acct_pernet_init(struct net *net)
 {
 	net->ct.sysctl_acct = nf_ct_acct;
-	return 0;
-}
-
-void nf_conntrack_acct_pernet_fini(struct net *net)
-{
 }
 
 int nf_conntrack_acct_init(void)
diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
@@ -2110,10 +2110,7 @@ void nf_conntrack_cleanup_net_list(struct list_head *net_exit_list)
 
 	list_for_each_entry(net, net_exit_list, exit_list) {
 		nf_conntrack_proto_pernet_fini(net);
-		nf_conntrack_helper_pernet_fini(net);
 		nf_conntrack_ecache_pernet_fini(net);
-		nf_conntrack_tstamp_pernet_fini(net);
-		nf_conntrack_acct_pernet_fini(net);
 		nf_conntrack_expect_pernet_fini(net);
 		free_percpu(net->ct.stat);
 		free_percpu(net->ct.pcpu_lists);
@@ -2410,32 +2407,19 @@ int nf_conntrack_init_net(struct net *net)
 	ret = nf_conntrack_expect_pernet_init(net);
 	if (ret < 0)
 		goto err_expect;
-	ret = nf_conntrack_acct_pernet_init(net);
-	if (ret < 0)
-		goto err_acct;
-	ret = nf_conntrack_tstamp_pernet_init(net);
-	if (ret < 0)
-		goto err_tstamp;
-	ret = nf_conntrack_ecache_pernet_init(net);
-	if (ret < 0)
-		goto err_ecache;
-	ret = nf_conntrack_helper_pernet_init(net);
-	if (ret < 0)
-		goto err_helper;
+
+	nf_conntrack_acct_pernet_init(net);
+	nf_conntrack_tstamp_pernet_init(net);
+	nf_conntrack_ecache_pernet_init(net);
+	nf_conntrack_helper_pernet_init(net);
+
 	ret = nf_conntrack_proto_pernet_init(net);
 	if (ret < 0)
 		goto err_proto;
 	return 0;
 
 err_proto:
-	nf_conntrack_helper_pernet_fini(net);
-err_helper:
 	nf_conntrack_ecache_pernet_fini(net);
-err_ecache:
-	nf_conntrack_tstamp_pernet_fini(net);
-err_tstamp:
-	nf_conntrack_acct_pernet_fini(net);
-err_acct:
 	nf_conntrack_expect_pernet_fini(net);
 err_expect:
 	free_percpu(net->ct.stat);
diff --git a/net/netfilter/nf_conntrack_ecache.c b/net/netfilter/nf_conntrack_ecache.c
@@ -342,11 +342,10 @@ static const struct nf_ct_ext_type event_extend = {
 	.id	= NF_CT_EXT_ECACHE,
 };
 
-int nf_conntrack_ecache_pernet_init(struct net *net)
+void nf_conntrack_ecache_pernet_init(struct net *net)
 {
 	net->ct.sysctl_events = nf_ct_events;
 	INIT_DELAYED_WORK(&net->ct.ecache_dwork, ecache_work);
-	return 0;
 }
 
 void nf_conntrack_ecache_pernet_fini(struct net *net)
diff --git a/net/netfilter/nf_conntrack_helper.c b/net/netfilter/nf_conntrack_helper.c
@@ -472,15 +472,10 @@ static const struct nf_ct_ext_type helper_extend = {
 	.id	= NF_CT_EXT_HELPER,
 };
 
-int nf_conntrack_helper_pernet_init(struct net *net)
+void nf_conntrack_helper_pernet_init(struct net *net)
 {
 	net->ct.auto_assign_helper_warned = false;
 	net->ct.sysctl_auto_assign_helper = nf_ct_auto_assign_helper;
-	return 0;
-}
-
-void nf_conntrack_helper_pernet_fini(struct net *net)
-{
 }
 
 int nf_conntrack_helper_init(void)
diff --git a/net/netfilter/nf_conntrack_timestamp.c b/net/netfilter/nf_conntrack_timestamp.c
@@ -28,14 +28,9 @@ static const struct nf_ct_ext_type tstamp_extend = {
 	.id	= NF_CT_EXT_TSTAMP,
 };
 
-int nf_conntrack_tstamp_pernet_init(struct net *net)
+void nf_conntrack_tstamp_pernet_init(struct net *net)
 {
 	net->ct.sysctl_tstamp = nf_ct_tstamp;
-	return 0;
-}
-
-void nf_conntrack_tstamp_pernet_fini(struct net *net)
-{
 }
 
 int nf_conntrack_tstamp_init(void)

Original file line number	Diff line number	Diff line change
`@@ -58,8 +58,7 @@ static inline void nf_ct_set_acct(struct net *net, bool enable)`
`58`	`58`	`net->ct.sysctl_acct = enable;`
`59`	`59`	`}`
`60`	`60`
`61`		`-int nf_conntrack_acct_pernet_init(struct net *net);`
`62`		`-void nf_conntrack_acct_pernet_fini(struct net *net);`
	`61`	`+void nf_conntrack_acct_pernet_init(struct net *net);`
`63`	`62`
`64`	`63`	`int nf_conntrack_acct_init(void);`
`65`	`64`	`void nf_conntrack_acct_fini(void);`
Original file line number	Diff line number	Diff line change
`@@ -124,8 +124,7 @@ static inline void nfct_help_data(const struct nf_conn ct)`
`124`	`124`	`return (void *)help->data;`
`125`	`125`	`}`
`126`	`126`
`127`		`-int nf_conntrack_helper_pernet_init(struct net *net);`
`128`		`-void nf_conntrack_helper_pernet_fini(struct net *net);`
	`127`	`+void nf_conntrack_helper_pernet_init(struct net *net);`
`129`	`128`
`130`	`129`	`int nf_conntrack_helper_init(void);`
`131`	`130`	`void nf_conntrack_helper_fini(void);`
Original file line number	Diff line number	Diff line change
`@@ -31,14 +31,9 @@ static const struct nf_ct_ext_type acct_extend = {`
`31`	`31`	`.id = NF_CT_EXT_ACCT,`
`32`	`32`	`};`
`33`	`33`
`34`		`-int nf_conntrack_acct_pernet_init(struct net *net)`
	`34`	`+void nf_conntrack_acct_pernet_init(struct net *net)`
`35`	`35`	`{`
`36`	`36`	`net->ct.sysctl_acct = nf_ct_acct;`
`37`		`- return 0;`
`38`		`-}`
`39`		`-`
`40`		`-void nf_conntrack_acct_pernet_fini(struct net *net)`
`41`		`-{`
`42`	`37`	`}`
`43`	`38`
`44`	`39`	`int nf_conntrack_acct_init(void)`
Original file line number	Diff line number	Diff line change
`@@ -342,11 +342,10 @@ static const struct nf_ct_ext_type event_extend = {`
`342`	`342`	`.id = NF_CT_EXT_ECACHE,`
`343`	`343`	`};`
`344`	`344`
`345`		`-int nf_conntrack_ecache_pernet_init(struct net *net)`
	`345`	`+void nf_conntrack_ecache_pernet_init(struct net *net)`
`346`	`346`	`{`
`347`	`347`	`net->ct.sysctl_events = nf_ct_events;`
`348`	`348`	`INIT_DELAYED_WORK(&net->ct.ecache_dwork, ecache_work);`
`349`		`- return 0;`
`350`	`349`	`}`
`351`	`350`
`352`	`351`	`void nf_conntrack_ecache_pernet_fini(struct net *net)`
Original file line number	Diff line number	Diff line change
`@@ -28,14 +28,9 @@ static const struct nf_ct_ext_type tstamp_extend = {`
`28`	`28`	`.id = NF_CT_EXT_TSTAMP,`
`29`	`29`	`};`
`30`	`30`
`31`		`-int nf_conntrack_tstamp_pernet_init(struct net *net)`
	`31`	`+void nf_conntrack_tstamp_pernet_init(struct net *net)`
`32`	`32`	`{`
`33`	`33`	`net->ct.sysctl_tstamp = nf_ct_tstamp;`
`34`		`- return 0;`
`35`		`-}`
`36`		`-`
`37`		`-void nf_conntrack_tstamp_pernet_fini(struct net *net)`
`38`		`-{`
`39`	`34`	`}`
`40`	`35`
`41`	`36`	`int nf_conntrack_tstamp_init(void)`