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

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

ipvs: Pass ipvs not net to ip_vs_sync_net_init 



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 1fc12004

include/net/ip_vs.h

+1 −1
Original line number Diff line number Diff line
@@ -1328,7 +1328,7 @@ int ip_vs_control_net_init(struct net *net); 
int ip_vs_protocol_net_init(struct net *net);

int ip_vs_app_net_init(struct net *net);

int ip_vs_conn_net_init(struct net *net);

int ip_vs_sync_net_init(struct net *net);

int ip_vs_sync_net_init(struct netns_ipvs *ipvs);

void ip_vs_conn_net_cleanup(struct net *net);

void ip_vs_app_net_cleanup(struct net *net);

void ip_vs_protocol_net_cleanup(struct net *net);

net/netfilter/ipvs/ip_vs_core.c

+1 −1
Original line number Diff line number Diff line
@@ -2087,7 +2087,7 @@ static int __net_init __ip_vs_init(struct net *net) 
	if (ip_vs_conn_net_init(net) < 0)

		goto conn_fail;



	if (ip_vs_sync_net_init(net) < 0)

	if (ip_vs_sync_net_init(ipvs) < 0)

		goto sync_fail;



	printk(KERN_INFO "IPVS: Creating netns size=%zu id=%d\n",

net/netfilter/ipvs/ip_vs_sync.c

+1 −3
Original line number Diff line number Diff line
@@ -2007,10 +2007,8 @@ int stop_sync_thread(struct netns_ipvs *ipvs, int state) 
/*

 * Initialize data struct for each netns

 */

int __net_init ip_vs_sync_net_init(struct net *net)

int __net_init ip_vs_sync_net_init(struct netns_ipvs *ipvs)

{

	struct netns_ipvs *ipvs = net_ipvs(net);



	__mutex_init(&ipvs->sync_mutex, "ipvs->sync_mutex", &__ipvs_sync_key);

	spin_lock_init(&ipvs->sync_lock);

	spin_lock_init(&ipvs->sync_buff_lock);