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

Commit f6ca9f46 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Simon Horman
Browse files

netfilter: ipvs: avoid unused variable warnings 



The proc_create() and remove_proc_entry() functions do not reference
their arguments when CONFIG_PROC_FS is disabled, so we get a couple
of warnings about unused variables in IPVS:

ipvs/ip_vs_app.c:608:14: warning: unused variable 'net' [-Wunused-variable]
ipvs/ip_vs_ctl.c:3950:14: warning: unused variable 'net' [-Wunused-variable]
ipvs/ip_vs_ctl.c:3994:14: warning: unused variable 'net' [-Wunused-variable]

This removes the local variables and instead looks them up separately
for each use, which obviously avoids the warning.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Fixes: 4c50a8ce2b63 ("netfilter: ipvs: avoid unused variable warning")
Acked-by: default avatarJulian Anastasov <ja@ssi.bg>
Signed-off-by: default avatarSimon Horman <horms@verge.net.au>
parent 2d9e9b0d

net/netfilter/ipvs/ip_vs_app.c

+2 −6
Original line number Diff line number Diff line
@@ -605,17 +605,13 @@ static const struct file_operations ip_vs_app_fops = { 


int __net_init ip_vs_app_net_init(struct netns_ipvs *ipvs)

{

	struct net *net = ipvs->net;



	INIT_LIST_HEAD(&ipvs->app_list);

	proc_create("ip_vs_app", 0, net->proc_net, &ip_vs_app_fops);

	proc_create("ip_vs_app", 0, ipvs->net->proc_net, &ip_vs_app_fops);

	return 0;

}



void __net_exit ip_vs_app_net_cleanup(struct netns_ipvs *ipvs)

{

	struct net *net = ipvs->net;



	unregister_ip_vs_app(ipvs, NULL /* all */);

	remove_proc_entry("ip_vs_app", net->proc_net);

	remove_proc_entry("ip_vs_app", ipvs->net->proc_net);

}

net/netfilter/ipvs/ip_vs_ctl.c

+6 −9
Original line number Diff line number Diff line
@@ -3945,7 +3945,6 @@ static struct notifier_block ip_vs_dst_notifier = { 


int __net_init ip_vs_control_net_init(struct netns_ipvs *ipvs)

{

	struct net *net = ipvs->net;

	int i, idx;



	/* Initialize rs_table */
@@ -3972,9 +3971,9 @@ int __net_init ip_vs_control_net_init(struct netns_ipvs *ipvs) 


	spin_lock_init(&ipvs->tot_stats.lock);



	proc_create("ip_vs", 0, net->proc_net, &ip_vs_info_fops);

	proc_create("ip_vs_stats", 0, net->proc_net, &ip_vs_stats_fops);

	proc_create("ip_vs_stats_percpu", 0, net->proc_net,

	proc_create("ip_vs", 0, ipvs->net->proc_net, &ip_vs_info_fops);

	proc_create("ip_vs_stats", 0, ipvs->net->proc_net, &ip_vs_stats_fops);

	proc_create("ip_vs_stats_percpu", 0, ipvs->net->proc_net,

		    &ip_vs_stats_percpu_fops);



	if (ip_vs_control_net_init_sysctl(ipvs))
@@ -3989,13 +3988,11 @@ int __net_init ip_vs_control_net_init(struct netns_ipvs *ipvs) 


void __net_exit ip_vs_control_net_cleanup(struct netns_ipvs *ipvs)

{

	struct net *net = ipvs->net;



	ip_vs_trash_cleanup(ipvs);

	ip_vs_control_net_cleanup_sysctl(ipvs);

	remove_proc_entry("ip_vs_stats_percpu", net->proc_net);

	remove_proc_entry("ip_vs_stats", net->proc_net);

	remove_proc_entry("ip_vs", net->proc_net);

	remove_proc_entry("ip_vs_stats_percpu", ipvs->net->proc_net);

	remove_proc_entry("ip_vs_stats", ipvs->net->proc_net);

	remove_proc_entry("ip_vs", ipvs->net->proc_net);

	free_percpu(ipvs->tot_stats.cpustats);

}