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

Commit 92240e8d authored by Simon Horman's avatar Simon Horman
Browse files

ipvs: Remove possibly unused variables from ip_vs_conn_net_{init,cleanup} 



If CONFIG_PROC_FS is undefined then the arguments of proc_create()
and remove_proc_entry() are unused. As a result the net variables of
ip_vs_conn_net_{init,cleanup} are unused.

net/netfilter/ipvs//ip_vs_conn.c: In function ‘ip_vs_conn_net_init’:
net/netfilter/ipvs//ip_vs_conn.c:1350:14: warning: unused variable ‘net’ [-Wunused-variable]
net/netfilter/ipvs//ip_vs_conn.c: In function ‘ip_vs_conn_net_cleanup’:
net/netfilter/ipvs//ip_vs_conn.c:1361:14: warning: unused variable ‘net’ [-Wunused-variable]
...

Resolve this by dereferencing net as needed rather than storing it
in a variable.

Fixes: 3d993766 ("ipvs: Pass ipvs not net into ip_vs_control_net_(init|cleanup)")
Signed-off-by: default avatarSimon Horman <horms@verge.net.au>
Acked-by: default avatarJulian Anastasov <ja@ssi.bg>
parent ed1c9f0e

net/netfilter/ipvs/ip_vs_conn.c

+5 −8
Original line number Diff line number Diff line
@@ -1347,23 +1347,20 @@ static void ip_vs_conn_flush(struct netns_ipvs *ipvs) 
 */

int __net_init ip_vs_conn_net_init(struct netns_ipvs *ipvs)

{

	struct net *net = ipvs->net;



	atomic_set(&ipvs->conn_count, 0);



	proc_create("ip_vs_conn", 0, net->proc_net, &ip_vs_conn_fops);

	proc_create("ip_vs_conn_sync", 0, net->proc_net, &ip_vs_conn_sync_fops);

	proc_create("ip_vs_conn", 0, ipvs->net->proc_net, &ip_vs_conn_fops);

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

		    &ip_vs_conn_sync_fops);

	return 0;

}



void __net_exit ip_vs_conn_net_cleanup(struct netns_ipvs *ipvs)

{

	struct net *net = ipvs->net;



	/* flush all the connection entries first */

	ip_vs_conn_flush(ipvs);

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

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

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

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

}



int __init ip_vs_conn_init(void)