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

ipvs: Pass ipvs not net to ip_vs_find_dest 



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 48aed1b0

include/net/ip_vs.h

+1 −1
Original line number Diff line number Diff line
@@ -1423,7 +1423,7 @@ void ip_vs_unregister_nl_ioctl(void); 
int ip_vs_control_init(void);

void ip_vs_control_cleanup(void);

struct ip_vs_dest *

ip_vs_find_dest(struct net *net, int svc_af, int dest_af,

ip_vs_find_dest(struct netns_ipvs *ipvs, int svc_af, int dest_af,

		const union nf_inet_addr *daddr, __be16 dport,

		const union nf_inet_addr *vaddr, __be16 vport,

		__u16 protocol, __u32 fwmark, __u32 flags);

net/netfilter/ipvs/ip_vs_conn.c

+1 −1
Original line number Diff line number Diff line
@@ -638,7 +638,7 @@ void ip_vs_try_bind_dest(struct ip_vs_conn *cp) 
	 * so we can make the assumption that the svc_af is the same as the

	 * dest_af

	 */

	dest = ip_vs_find_dest(cp->ipvs->net, cp->af, cp->af, &cp->daddr,

	dest = ip_vs_find_dest(cp->ipvs, cp->af, cp->af, &cp->daddr,

			       cp->dport, &cp->vaddr, cp->vport,

			       cp->protocol, cp->fwmark, cp->flags);

	if (dest) {

net/netfilter/ipvs/ip_vs_ctl.c

+2 −2
Original line number Diff line number Diff line
@@ -599,7 +599,7 @@ ip_vs_lookup_dest(struct ip_vs_service *svc, int dest_af, 
 * on the backup.

 * Called under RCU lock, no refcnt is returned.

 */

struct ip_vs_dest *ip_vs_find_dest(struct net  *net, int svc_af, int dest_af,

struct ip_vs_dest *ip_vs_find_dest(struct netns_ipvs *ipvs, int svc_af, int dest_af,

				   const union nf_inet_addr *daddr,

				   __be16 dport,

				   const union nf_inet_addr *vaddr,
@@ -610,7 +610,7 @@ struct ip_vs_dest *ip_vs_find_dest(struct net *net, int svc_af, int dest_af, 
	struct ip_vs_service *svc;

	__be16 port = dport;



	svc = ip_vs_service_find(net_ipvs(net), svc_af, fwmark, protocol, vaddr, vport);

	svc = ip_vs_service_find(ipvs, svc_af, fwmark, protocol, vaddr, vport);

	if (!svc)

		return NULL;

	if (fwmark && (flags & IP_VS_CONN_F_FWD_MASK) != IP_VS_CONN_F_MASQ)

net/netfilter/ipvs/ip_vs_sync.c

+1 −1
Original line number Diff line number Diff line
@@ -904,7 +904,7 @@ static void ip_vs_proc_conn(struct net *net, struct ip_vs_conn_param *param, 
		 * with synchronization, so we can make the assumption that

		 * the svc_af is the same as the dest_af

		 */

		dest = ip_vs_find_dest(net, type, type, daddr, dport,

		dest = ip_vs_find_dest(ipvs, type, type, daddr, dport,

				       param->vaddr, param->vport, protocol,

				       fwmark, flags);