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

ipvs: Pass ipvs not net into ip_vs_conn_net_init and ip_vs_conn_net_cleanup 



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 d889717a

include/net/ip_vs.h

+2 −2
Original line number Diff line number Diff line
@@ -1331,9 +1331,9 @@ int ip_vs_estimator_net_init(struct netns_ipvs *ipvs); 
int ip_vs_control_net_init(struct netns_ipvs *ipvs);

int ip_vs_protocol_net_init(struct net *net);

int ip_vs_app_net_init(struct netns_ipvs *ipvs);

int ip_vs_conn_net_init(struct net *net);

int ip_vs_conn_net_init(struct netns_ipvs *ipvs);

int ip_vs_sync_net_init(struct netns_ipvs *ipvs);

void ip_vs_conn_net_cleanup(struct net *net);

void ip_vs_conn_net_cleanup(struct netns_ipvs *ipvs);

void ip_vs_app_net_cleanup(struct netns_ipvs *ipvs);

void ip_vs_protocol_net_cleanup(struct net *net);

void ip_vs_control_net_cleanup(struct netns_ipvs *ipvs);

net/netfilter/ipvs/ip_vs_conn.c

+4 −4
Original line number Diff line number Diff line
@@ -1345,9 +1345,9 @@ static void ip_vs_conn_flush(struct netns_ipvs *ipvs) 
/*

 * per netns init and exit

 */

int __net_init ip_vs_conn_net_init(struct net *net)

int __net_init ip_vs_conn_net_init(struct netns_ipvs *ipvs)

{

	struct netns_ipvs *ipvs = net_ipvs(net);

	struct net *net = ipvs->net;



	atomic_set(&ipvs->conn_count, 0);
@@ -1356,9 +1356,9 @@ int __net_init ip_vs_conn_net_init(struct net *net) 
	return 0;

}



void __net_exit ip_vs_conn_net_cleanup(struct net *net)

void __net_exit ip_vs_conn_net_cleanup(struct netns_ipvs *ipvs)

{

	struct netns_ipvs *ipvs = net_ipvs(net);

	struct net *net = ipvs->net;



	/* flush all the connection entries first */

	ip_vs_conn_flush(ipvs);

net/netfilter/ipvs/ip_vs_core.c

+3 −3
Original line number Diff line number Diff line
@@ -2086,7 +2086,7 @@ static int __net_init __ip_vs_init(struct net *net) 
	if (ip_vs_app_net_init(ipvs) < 0)

		goto app_fail;



	if (ip_vs_conn_net_init(net) < 0)

	if (ip_vs_conn_net_init(ipvs) < 0)

		goto conn_fail;



	if (ip_vs_sync_net_init(ipvs) < 0)
@@ -2100,7 +2100,7 @@ static int __net_init __ip_vs_init(struct net *net) 
 */



sync_fail:

	ip_vs_conn_net_cleanup(net);

	ip_vs_conn_net_cleanup(ipvs);

conn_fail:

	ip_vs_app_net_cleanup(ipvs);

app_fail:
@@ -2119,7 +2119,7 @@ static void __net_exit __ip_vs_cleanup(struct net *net) 
	struct netns_ipvs *ipvs = net_ipvs(net);



	ip_vs_service_net_cleanup(ipvs);	/* ip_vs_flush() with locks */

	ip_vs_conn_net_cleanup(net);

	ip_vs_conn_net_cleanup(ipvs);

	ip_vs_app_net_cleanup(ipvs);

	ip_vs_protocol_net_cleanup(net);

	ip_vs_control_net_cleanup(ipvs);