diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2015-09-21 13:02:33 -0500 |
|---|---|---|
| committer | Simon Horman <horms@verge.net.au> | 2015-09-24 09:34:40 +0900 |
| commit | 09858708e68c7d9900e631e1e6e91a882e59518d (patch) | |
| tree | 5254f988a135161efa8c48388f4b59761ddf091a /net/netfilter/ipvs/ip_vs_app.c | |
| parent | 9f8128a56ef241753ea038e92948fe13beacf59f (diff) | |
| download | op-kernel-dev-09858708e68c7d9900e631e1e6e91a882e59518d.zip op-kernel-dev-09858708e68c7d9900e631e1e6e91a882e59518d.tar.gz | |
ipvs: Pass ipvs not net into ip_vs_app_inc_release
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_app.c')
| -rw-r--r-- | net/netfilter/ipvs/ip_vs_app.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/net/netfilter/ipvs/ip_vs_app.c b/net/netfilter/ipvs/ip_vs_app.c index a0cc083..42220a0 100644 --- a/net/netfilter/ipvs/ip_vs_app.c +++ b/net/netfilter/ipvs/ip_vs_app.c @@ -127,9 +127,8 @@ ip_vs_app_inc_new(struct netns_ipvs *ipvs, struct ip_vs_app *app, __u16 proto, * Release app incarnation */ 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; 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) { struct ip_vs_app *a, *anxt, *inc, *nxt; - struct net *net = ipvs->net; 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)) continue; 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); |
