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

ipvs: Pass ipvs not net to ip_vs_protocol_net_(init|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 69f39093

include/net/ip_vs.h

+2 −2
Original line number Diff line number Diff line
@@ -1340,13 +1340,13 @@ ip_vs_control_add(struct ip_vs_conn *cp, struct ip_vs_conn *ctl_cp) 
/* IPVS netns init & cleanup functions */

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_protocol_net_init(struct netns_ipvs *ipvs);

int ip_vs_app_net_init(struct netns_ipvs *ipvs);

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 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_protocol_net_cleanup(struct netns_ipvs *ipvs);

void ip_vs_control_net_cleanup(struct netns_ipvs *ipvs);

void ip_vs_estimator_net_cleanup(struct netns_ipvs *ipvs);

void ip_vs_sync_net_cleanup(struct netns_ipvs *ipvs);

net/netfilter/ipvs/ip_vs_core.c

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

		goto control_fail;



	if (ip_vs_protocol_net_init(net) < 0)

	if (ip_vs_protocol_net_init(ipvs) < 0)

		goto protocol_fail;



	if (ip_vs_app_net_init(ipvs) < 0)
@@ -2076,7 +2076,7 @@ static int __net_init __ip_vs_init(struct net *net) 
conn_fail:

	ip_vs_app_net_cleanup(ipvs);

app_fail:

	ip_vs_protocol_net_cleanup(net);

	ip_vs_protocol_net_cleanup(ipvs);

protocol_fail:

	ip_vs_control_net_cleanup(ipvs);

control_fail:
@@ -2093,7 +2093,7 @@ static void __net_exit __ip_vs_cleanup(struct net *net) 
	ip_vs_service_net_cleanup(ipvs);	/* ip_vs_flush() with locks */

	ip_vs_conn_net_cleanup(ipvs);

	ip_vs_app_net_cleanup(ipvs);

	ip_vs_protocol_net_cleanup(net);

	ip_vs_protocol_net_cleanup(ipvs);

	ip_vs_control_net_cleanup(ipvs);

	ip_vs_estimator_net_cleanup(ipvs);

	IP_VS_DBG(2, "ipvs netns %d released\n", ipvs->gen);

net/netfilter/ipvs/ip_vs_proto.c

+3 −5
Original line number Diff line number Diff line
@@ -307,7 +307,7 @@ ip_vs_tcpudp_debug_packet(int af, struct ip_vs_protocol *pp, 
/*

 * per network name-space init

 */

int __net_init ip_vs_protocol_net_init(struct net *net)

int __net_init ip_vs_protocol_net_init(struct netns_ipvs *ipvs)

{

	int i, ret;

	static struct ip_vs_protocol *protos[] = {
@@ -327,7 +327,6 @@ int __net_init ip_vs_protocol_net_init(struct net *net) 
	&ip_vs_protocol_esp,

#endif

	};

	struct netns_ipvs *ipvs = net_ipvs(net);



	for (i = 0; i < ARRAY_SIZE(protos); i++) {

		ret = register_ip_vs_proto_netns(ipvs, protos[i]);
@@ -337,13 +336,12 @@ int __net_init ip_vs_protocol_net_init(struct net *net) 
	return 0;



cleanup:

	ip_vs_protocol_net_cleanup(net);

	ip_vs_protocol_net_cleanup(ipvs);

	return ret;

}



void __net_exit ip_vs_protocol_net_cleanup(struct net *net)

void __net_exit ip_vs_protocol_net_cleanup(struct netns_ipvs *ipvs)

{

	struct netns_ipvs *ipvs = net_ipvs(net);

	struct ip_vs_proto_data *pd;

	int i;