p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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: 3d99376689 ("ipvs: Pass ipvs not net into ip_vs_control_net_(init|cleanup)")
Signed-off-by: Simon Horman <horms@verge.net.au>
Acked-by: Julian Anastasov <ja@ssi.bg>
This commit is contained in:
Simon Horman 2015-10-06 17:09:52 +09:00
parent ed1c9f0e78
commit 92240e8dc0
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
net/netfilter/ipvs/ip_vs_conn.c
View File

@ -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) int __net_init ip_vs_conn_net_init(struct netns_ipvs *ipvs)
{ {
struct net *net = ipvs->net;
atomic_set(&ipvs->conn_count, 0); atomic_set(&ipvs->conn_count, 0);
proc_create("ip_vs_conn", 0, net->proc_net, &ip_vs_conn_fops); proc_create("ip_vs_conn", 0, ipvs->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_sync", 0, ipvs->net->proc_net,
&ip_vs_conn_sync_fops);
return 0; return 0;
} }
void __net_exit ip_vs_conn_net_cleanup(struct netns_ipvs *ipvs) void __net_exit ip_vs_conn_net_cleanup(struct netns_ipvs *ipvs)
{ {
struct net *net = ipvs->net;
/* flush all the connection entries first */ /* flush all the connection entries first */
ip_vs_conn_flush(ipvs); ip_vs_conn_flush(ipvs);
remove_proc_entry("ip_vs_conn", net->proc_net); remove_proc_entry("ip_vs_conn", ipvs->net->proc_net);
remove_proc_entry("ip_vs_conn_sync", net->proc_net); remove_proc_entry("ip_vs_conn_sync", ipvs->net->proc_net);
} }
int __init ip_vs_conn_init(void) int __init ip_vs_conn_init(void)