evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ipvs: Pass ipvs not net into ip_vs_app_inc_release

Browse source 
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>
This commit is contained in:
Eric W. Biederman 2015-09-21 13:02:33 -05:00 • committed by Simon Horman
parent 9f8128a56e
commit 09858708e6
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
net/netfilter/ipvs/ip_vs_app.c
View file

@ -127,9 +127,8 @@ ip_vs_app_inc_new(struct netns_ipvs *ipvs, struct ip_vs_app *app, __u16 proto,
* Release app incarnation * Release app incarnation
*/ */
static void static void
ip_vs_app_inc_release(struct net *net, struct ip_vs_app *inc) ip_vs_app_inc_release(struct netns_ipvs *ipvs, struct ip_vs_app *inc)
{ {
struct netns_ipvs *ipvs = net_ipvs(net);
struct ip_vs_protocol *pp; struct ip_vs_protocol *pp;
if (!(pp = ip_vs_proto_get(inc->protocol))) if (!(pp = ip_vs_proto_get(inc->protocol)))
@ -230,7 +229,6 @@ out_unlock:
void unregister_ip_vs_app(struct netns_ipvs *ipvs, struct ip_vs_app *app) void unregister_ip_vs_app(struct netns_ipvs *ipvs, struct ip_vs_app *app)
{ {
struct ip_vs_app *a, *anxt, *inc, *nxt; struct ip_vs_app *a, *anxt, *inc, *nxt;
struct net *net = ipvs->net;
mutex_lock(&__ip_vs_app_mutex); mutex_lock(&__ip_vs_app_mutex);
@ -238,7 +236,7 @@ void unregister_ip_vs_app(struct netns_ipvs *ipvs, struct ip_vs_app *app)
if (app && strcmp(app->name, a->name)) if (app && strcmp(app->name, a->name))
continue; continue;
list_for_each_entry_safe(inc, nxt, &a->incs_list, a_list) { list_for_each_entry_safe(inc, nxt, &a->incs_list, a_list) {
ip_vs_app_inc_release(net, inc); ip_vs_app_inc_release(ipvs, inc);
} }
list_del(&a->a_list); list_del(&a->a_list);