Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 09858708 authored by Eric W. Biederman's avatar Eric W. Biederman Committed by Simon Horman
Browse files

ipvs: Pass ipvs not net into ip_vs_app_inc_release 



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 9f8128a5

net/netfilter/ipvs/ip_vs_app.c

+2 −4
Original line number Diff line number Diff line
@@ -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 @@ struct ip_vs_app *register_ip_vs_app(struct netns_ipvs *ipvs, struct ip_vs_app * 
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);