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

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

ipvs: Pass ipvs not net into init_netns and exit_netns 



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 c70bd680

include/net/ip_vs.h

+2 −2
Original line number Diff line number Diff line
@@ -483,9 +483,9 @@ struct ip_vs_protocol { 


	void (*exit)(struct ip_vs_protocol *pp);



	int (*init_netns)(struct net *net, struct ip_vs_proto_data *pd);

	int (*init_netns)(struct netns_ipvs *ipvs, struct ip_vs_proto_data *pd);



	void (*exit_netns)(struct net *net, struct ip_vs_proto_data *pd);

	void (*exit_netns)(struct netns_ipvs *ipvs, struct ip_vs_proto_data *pd);



	int (*conn_schedule)(int af, struct sk_buff *skb,

			     struct ip_vs_proto_data *pd,

net/netfilter/ipvs/ip_vs_proto.c

+2 −2
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ register_ip_vs_proto_netns(struct netns_ipvs *ipvs, struct ip_vs_protocol *pp) 
	atomic_set(&pd->appcnt, 0);	/* Init app counter */



	if (pp->init_netns != NULL) {

		int ret = pp->init_netns(ipvs->net, pd);

		int ret = pp->init_netns(ipvs, pd);

		if (ret) {

			/* unlink an free proto data */

			ipvs->proto_data_table[hash] = pd->next;
@@ -125,7 +125,7 @@ unregister_ip_vs_proto_netns(struct netns_ipvs *ipvs, struct ip_vs_proto_data *p 
		if (*pd_p == pd) {

			*pd_p = pd->next;

			if (pd->pp->exit_netns != NULL)

				pd->pp->exit_netns(ipvs->net, pd);

				pd->pp->exit_netns(ipvs, pd);

			kfree(pd);

			return 0;

		}

net/netfilter/ipvs/ip_vs_proto_sctp.c

+2 −4
Original line number Diff line number Diff line
@@ -561,10 +561,8 @@ static int sctp_app_conn_bind(struct ip_vs_conn *cp) 
 *   timeouts is netns related now.

 * ---------------------------------------------

 */

static int __ip_vs_sctp_init(struct net *net, struct ip_vs_proto_data *pd)

static int __ip_vs_sctp_init(struct netns_ipvs *ipvs, struct ip_vs_proto_data *pd)

{

	struct netns_ipvs *ipvs = net_ipvs(net);



	ip_vs_init_hash_table(ipvs->sctp_apps, SCTP_APP_TAB_SIZE);

	pd->timeout_table = ip_vs_create_timeout_table((int *)sctp_timeouts,

							sizeof(sctp_timeouts));
@@ -573,7 +571,7 @@ static int __ip_vs_sctp_init(struct net *net, struct ip_vs_proto_data *pd) 
	return 0;

}



static void __ip_vs_sctp_exit(struct net *net, struct ip_vs_proto_data *pd)

static void __ip_vs_sctp_exit(struct netns_ipvs *ipvs, struct ip_vs_proto_data *pd)

{

	kfree(pd->timeout_table);

}

net/netfilter/ipvs/ip_vs_proto_tcp.c

+2 −4
Original line number Diff line number Diff line
@@ -691,10 +691,8 @@ void ip_vs_tcp_conn_listen(struct net *net, struct ip_vs_conn *cp) 
 *   timeouts is netns related now.

 * ---------------------------------------------

 */

static int __ip_vs_tcp_init(struct net *net, struct ip_vs_proto_data *pd)

static int __ip_vs_tcp_init(struct netns_ipvs *ipvs, struct ip_vs_proto_data *pd)

{

	struct netns_ipvs *ipvs = net_ipvs(net);



	ip_vs_init_hash_table(ipvs->tcp_apps, TCP_APP_TAB_SIZE);

	pd->timeout_table = ip_vs_create_timeout_table((int *)tcp_timeouts,

							sizeof(tcp_timeouts));
@@ -704,7 +702,7 @@ static int __ip_vs_tcp_init(struct net *net, struct ip_vs_proto_data *pd) 
	return 0;

}



static void __ip_vs_tcp_exit(struct net *net, struct ip_vs_proto_data *pd)

static void __ip_vs_tcp_exit(struct netns_ipvs *ipvs, struct ip_vs_proto_data *pd)

{

	kfree(pd->timeout_table);

}

net/netfilter/ipvs/ip_vs_proto_udp.c

+2 −4
Original line number Diff line number Diff line
@@ -472,10 +472,8 @@ udp_state_transition(struct ip_vs_conn *cp, int direction, 
	cp->timeout = pd->timeout_table[IP_VS_UDP_S_NORMAL];

}



static int __udp_init(struct net *net, struct ip_vs_proto_data *pd)

static int __udp_init(struct netns_ipvs *ipvs, struct ip_vs_proto_data *pd)

{

	struct netns_ipvs *ipvs = net_ipvs(net);



	ip_vs_init_hash_table(ipvs->udp_apps, UDP_APP_TAB_SIZE);

	pd->timeout_table = ip_vs_create_timeout_table((int *)udp_timeouts,

							sizeof(udp_timeouts));
@@ -484,7 +482,7 @@ static int __udp_init(struct net *net, struct ip_vs_proto_data *pd) 
	return 0;

}



static void __udp_exit(struct net *net, struct ip_vs_proto_data *pd)

static void __udp_exit(struct netns_ipvs *ipvs, struct ip_vs_proto_data *pd)

{

	kfree(pd->timeout_table);

}