diff options
| author | Eric W. Biederman | 2015-09-21 20:01:53 +0200 |
|---|---|---|
| committer | Simon Horman | 2015-09-24 02:34:34 +0200 |
| commit | 79ac82e0aaff327383beb860150fb2a85aa7b743 (patch) | |
| tree | e2c786810058b1e647265aa199db1c73dc9e1777 /net/netfilter/ipvs/ip_vs_ctl.c | |
| parent | ipvs: Pass ipvs not net to ip_vs_trash_cleanup (diff) | |
| download | kernel-qcow2-linux-79ac82e0aaff327383beb860150fb2a85aa7b743.tar.gz kernel-qcow2-linux-79ac82e0aaff327383beb860150fb2a85aa7b743.tar.xz kernel-qcow2-linux-79ac82e0aaff327383beb860150fb2a85aa7b743.zip | |
ipvs: Pass ipvs not net to __ip_vs_del_dest
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Acked-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Simon Horman <horms@verge.net.au>
Diffstat (limited to 'net/netfilter/ipvs/ip_vs_ctl.c')
| -rw-r--r-- | net/netfilter/ipvs/ip_vs_ctl.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c index b66ab765f36d..b295e2bb706f 100644 --- a/net/netfilter/ipvs/ip_vs_ctl.c +++ b/net/netfilter/ipvs/ip_vs_ctl.c @@ -1033,12 +1033,10 @@ ip_vs_edit_dest(struct ip_vs_service *svc, struct ip_vs_dest_user_kern *udest) /* * Delete a destination (must be already unlinked from the service) */ -static void __ip_vs_del_dest(struct net *net, struct ip_vs_dest *dest, +static void __ip_vs_del_dest(struct netns_ipvs *ipvs, struct ip_vs_dest *dest, bool cleanup) { - struct netns_ipvs *ipvs = net_ipvs(net); - - ip_vs_stop_estimator(net, &dest->stats); + ip_vs_stop_estimator(ipvs->net, &dest->stats); /* * Remove it from the d-linked list with the real services. @@ -1117,7 +1115,7 @@ ip_vs_del_dest(struct ip_vs_service *svc, struct ip_vs_dest_user_kern *udest) /* * Delete the destination */ - __ip_vs_del_dest(svc->ipvs->net, dest, false); + __ip_vs_del_dest(svc->ipvs, dest, false); LeaveFunction(2); @@ -1402,7 +1400,7 @@ static void __ip_vs_del_service(struct ip_vs_service *svc, bool cleanup) */ list_for_each_entry_safe(dest, nxt, &svc->destinations, n_list) { __ip_vs_unlink_dest(svc, dest, 0); - __ip_vs_del_dest(svc->ipvs->net, dest, cleanup); + __ip_vs_del_dest(svc->ipvs, dest, cleanup); } /* |