Commit d889717a authored by Eric W. Biederman's avatar Eric W. Biederman Committed by Simon Horman

ipvs: Pass ipvs not net into ip_vs_conn_net_flush

Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
Acked-by: default avatarJulian Anastasov <ja@ssi.bg>
Signed-off-by: default avatarSimon Horman <horms@verge.net.au>
parent 754b81a3
...@@ -1309,11 +1309,10 @@ void ip_vs_random_dropentry(struct netns_ipvs *ipvs) ...@@ -1309,11 +1309,10 @@ void ip_vs_random_dropentry(struct netns_ipvs *ipvs)
/* /*
* Flush all the connection entries in the ip_vs_conn_tab * Flush all the connection entries in the ip_vs_conn_tab
*/ */
static void ip_vs_conn_flush(struct net *net) static void ip_vs_conn_flush(struct netns_ipvs *ipvs)
{ {
int idx; int idx;
struct ip_vs_conn *cp, *cp_c; struct ip_vs_conn *cp, *cp_c;
struct netns_ipvs *ipvs = net_ipvs(net);
flush_again: flush_again:
rcu_read_lock(); rcu_read_lock();
...@@ -1359,8 +1358,10 @@ int __net_init ip_vs_conn_net_init(struct net *net) ...@@ -1359,8 +1358,10 @@ int __net_init ip_vs_conn_net_init(struct net *net)
void __net_exit ip_vs_conn_net_cleanup(struct net *net) void __net_exit ip_vs_conn_net_cleanup(struct net *net)
{ {
struct netns_ipvs *ipvs = net_ipvs(net);
/* flush all the connection entries first */ /* flush all the connection entries first */
ip_vs_conn_flush(net); ip_vs_conn_flush(ipvs);
remove_proc_entry("ip_vs_conn", net->proc_net); 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_sync", net->proc_net);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment