[PATCH next 06/84] ipvs: Pass ipvs not net to ip_vs_fill_conn

[Eric W. Biederman]

ipvs is what is actually desired so change the parameter and the modify
the callers to pass struct netns_ipvs.

Signed-off-by: "Eric W. Biederman" 
---
 include/net/ip_vs.h |  4 ++--
 net/netfilter/ipvs/ip_vs_conn.c |  8 
 net/netfilter/ipvs/ip_vs_core.c |  8 
 net/netfilter/ipvs/ip_vs_ftp.c  |  6 +++---
 net/netfilter/ipvs/ip_vs_nfct.c |  2 +-
 net/netfilter/ipvs/ip_vs_proto_ah_esp.c | 14 +++---
 net/netfilter/ipvs/ip_vs_sync.c | 16 
 7 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
index 8cca99bbe15b..83e2aea63db2 100644
--- a/include/net/ip_vs.h
+++ b/include/net/ip_vs.h
@@ -1201,14 +1201,14 @@ enum {
IP_VS_DIR_LAST,
 };
 
-static inline void ip_vs_conn_fill_param(struct net *net, int af, int protocol,
+static inline void ip_vs_conn_fill_param(struct netns_ipvs *ipvs, int af, int 
protocol,
 const union nf_inet_addr *caddr,
 __be16 cport,
 const union nf_inet_addr *vaddr,
 __be16 vport,
 struct ip_vs_conn_param *p)
 {
-   p->ipvs = net_ipvs(net);
+   p->ipvs = ipvs;
p->af = af;
p->protocol = protocol;
p->caddr = caddr;
diff --git a/net/netfilter/ipvs/ip_vs_conn.c b/net/netfilter/ipvs/ip_vs_conn.c
index 72c47ee2f9f5..3e277093ec45 100644
--- a/net/netfilter/ipvs/ip_vs_conn.c
+++ b/net/netfilter/ipvs/ip_vs_conn.c
@@ -148,7 +148,7 @@ static unsigned int ip_vs_conn_hashkey_conn(const struct 
ip_vs_conn *cp)
 {
struct ip_vs_conn_param p;
 
-   ip_vs_conn_fill_param(cp->ipvs->net, cp->af, cp->protocol,
+   ip_vs_conn_fill_param(cp->ipvs, cp->af, cp->protocol,
  &cp->caddr, cp->cport, NULL, 0, &p);
 
if (cp->pe) {
@@ -319,17 +319,17 @@ ip_vs_conn_fill_param_proto(int af, const struct sk_buff 
*skb,
struct ip_vs_conn_param *p)
 {
__be16 _ports[2], *pptr;
-   struct net *net = skb_net(skb);
+   struct netns_ipvs *ipvs = net_ipvs(skb_net(skb));
 
pptr = frag_safe_skb_hp(skb, iph->len, sizeof(_ports), _ports, iph);
if (pptr == NULL)
return 1;
 
if (likely(!ip_vs_iph_inverse(iph)))
-   ip_vs_conn_fill_param(net, af, iph->protocol, &iph->saddr,
+   ip_vs_conn_fill_param(ipvs, af, iph->protocol, &iph->saddr,
  pptr[0], &iph->daddr, pptr[1], p);
else
-   ip_vs_conn_fill_param(net, af, iph->protocol, &iph->daddr,
+   ip_vs_conn_fill_param(ipvs, af, iph->protocol, &iph->daddr,
  pptr[1], &iph->saddr, pptr[0], p);
return 0;
 }
diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c
index 3f33a076aaec..fd02aec0a11a 100644
--- a/net/netfilter/ipvs/ip_vs_core.c
+++ b/net/netfilter/ipvs/ip_vs_core.c
@@ -215,7 +215,7 @@ ip_vs_conn_fill_param_persist(const struct ip_vs_service 
*svc,
  const union nf_inet_addr *vaddr, __be16 vport,
  struct ip_vs_conn_param *p)
 {
-   ip_vs_conn_fill_param(svc->net, svc->af, protocol, caddr, cport, vaddr,
+   ip_vs_conn_fill_param(net_ipvs(svc->net), svc->af, protocol, caddr, 
cport, vaddr,
  vport, p);
p->pe = rcu_dereference(svc->pe);
if (p->pe && p->pe->fill_param)
@@ -376,7 +376,7 @@ ip_vs_sched_persist(struct ip_vs_service *svc,
/*
 *Create a new connection according to the template
 */
-   ip_vs_conn_fill_param(svc->net, svc->af, iph->protocol, src_addr,
+   ip_vs_conn_fill_param(net_ipvs(svc->net), svc->af, iph->protocol, 
src_addr,
  src_port, dst_addr, dst_port, ¶m);
 
cp = ip_vs_conn_new(¶m, dest->af, &dest->addr, dport, flags, dest,
@@ -524,7 +524,7 @@ ip_vs_schedule(struct ip_vs_service *svc, struct sk_buff 
*skb,
{
struct ip_vs_conn_param p;
 
-   ip_vs_conn_fill_param(svc->net, svc->af, iph->protocol,
+   ip_vs_conn_fill_param(net_ipvs(svc->net), svc->af, 
iph->protocol,
  caddr, cport, vaddr, vport, &p);
cp = ip_vs_conn_new(&p, dest->af, &dest->addr,
dest->port ? dest->port : vport,
@@ -600,7 +600,7 @@ int ip_vs_leave(struct ip_vs_service *svc, struct sk_buff 
*skb,
IP_VS_DBG(6, "%s(): create a cache_bypass entry\n", __func__);
{
struct ip_vs_conn_param p;
-   ip_vs_conn_fill_param(svc->net, svc->af, iph->protocol,
+   ip_vs_conn_fill_param(net_ipvs(svc->net), svc->af, 
iph->protocol,
   

[PATCH next 06/84] ipvs: Pass ipvs not net to ip_vs_fill_conn

[Eric W. Biederman]

ipvs is what is actually desired so change the parameter and the modify
the callers to pass struct netns_ipvs.

Signed-off-by: "Eric W. Biederman" 
---
 include/net/ip_vs.h |  4 ++--
 net/netfilter/ipvs/ip_vs_conn.c |  8 
 net/netfilter/ipvs/ip_vs_core.c |  8 
 net/netfilter/ipvs/ip_vs_ftp.c  |  6 +++---
 net/netfilter/ipvs/ip_vs_nfct.c |  2 +-
 net/netfilter/ipvs/ip_vs_proto_ah_esp.c | 14 +++---
 net/netfilter/ipvs/ip_vs_sync.c | 16 
 7 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
index 8cca99bbe15b..83e2aea63db2 100644
--- a/include/net/ip_vs.h
+++ b/include/net/ip_vs.h
@@ -1201,14 +1201,14 @@ enum {
IP_VS_DIR_LAST,
 };
 
-static inline void ip_vs_conn_fill_param(struct net *net, int af, int protocol,
+static inline void ip_vs_conn_fill_param(struct netns_ipvs *ipvs, int af, int 
protocol,
 const union nf_inet_addr *caddr,
 __be16 cport,
 const union nf_inet_addr *vaddr,
 __be16 vport,
 struct ip_vs_conn_param *p)
 {
-   p->ipvs = net_ipvs(net);
+   p->ipvs = ipvs;
p->af = af;
p->protocol = protocol;
p->caddr = caddr;
diff --git a/net/netfilter/ipvs/ip_vs_conn.c b/net/netfilter/ipvs/ip_vs_conn.c
index d1b19bbacb45..afc7a7558434 100644
--- a/net/netfilter/ipvs/ip_vs_conn.c
+++ b/net/netfilter/ipvs/ip_vs_conn.c
@@ -148,7 +148,7 @@ static unsigned int ip_vs_conn_hashkey_conn(const struct 
ip_vs_conn *cp)
 {
struct ip_vs_conn_param p;
 
-   ip_vs_conn_fill_param(cp->ipvs->net, cp->af, cp->protocol,
+   ip_vs_conn_fill_param(cp->ipvs, cp->af, cp->protocol,
  &cp->caddr, cp->cport, NULL, 0, &p);
 
if (cp->pe) {
@@ -319,17 +319,17 @@ ip_vs_conn_fill_param_proto(int af, const struct sk_buff 
*skb,
struct ip_vs_conn_param *p)
 {
__be16 _ports[2], *pptr;
-   struct net *net = skb_net(skb);
+   struct netns_ipvs *ipvs = net_ipvs(skb_net(skb));
 
pptr = frag_safe_skb_hp(skb, iph->len, sizeof(_ports), _ports, iph);
if (pptr == NULL)
return 1;
 
if (likely(!ip_vs_iph_inverse(iph)))
-   ip_vs_conn_fill_param(net, af, iph->protocol, &iph->saddr,
+   ip_vs_conn_fill_param(ipvs, af, iph->protocol, &iph->saddr,
  pptr[0], &iph->daddr, pptr[1], p);
else
-   ip_vs_conn_fill_param(net, af, iph->protocol, &iph->daddr,
+   ip_vs_conn_fill_param(ipvs, af, iph->protocol, &iph->daddr,
  pptr[1], &iph->saddr, pptr[0], p);
return 0;
 }
diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c
index 3f33a076aaec..fd02aec0a11a 100644
--- a/net/netfilter/ipvs/ip_vs_core.c
+++ b/net/netfilter/ipvs/ip_vs_core.c
@@ -215,7 +215,7 @@ ip_vs_conn_fill_param_persist(const struct ip_vs_service 
*svc,
  const union nf_inet_addr *vaddr, __be16 vport,
  struct ip_vs_conn_param *p)
 {
-   ip_vs_conn_fill_param(svc->net, svc->af, protocol, caddr, cport, vaddr,
+   ip_vs_conn_fill_param(net_ipvs(svc->net), svc->af, protocol, caddr, 
cport, vaddr,
  vport, p);
p->pe = rcu_dereference(svc->pe);
if (p->pe && p->pe->fill_param)
@@ -376,7 +376,7 @@ ip_vs_sched_persist(struct ip_vs_service *svc,
/*
 *Create a new connection according to the template
 */
-   ip_vs_conn_fill_param(svc->net, svc->af, iph->protocol, src_addr,
+   ip_vs_conn_fill_param(net_ipvs(svc->net), svc->af, iph->protocol, 
src_addr,
  src_port, dst_addr, dst_port, ¶m);
 
cp = ip_vs_conn_new(¶m, dest->af, &dest->addr, dport, flags, dest,
@@ -524,7 +524,7 @@ ip_vs_schedule(struct ip_vs_service *svc, struct sk_buff 
*skb,
{
struct ip_vs_conn_param p;
 
-   ip_vs_conn_fill_param(svc->net, svc->af, iph->protocol,
+   ip_vs_conn_fill_param(net_ipvs(svc->net), svc->af, 
iph->protocol,
  caddr, cport, vaddr, vport, &p);
cp = ip_vs_conn_new(&p, dest->af, &dest->addr,
dest->port ? dest->port : vport,
@@ -600,7 +600,7 @@ int ip_vs_leave(struct ip_vs_service *svc, struct sk_buff 
*skb,
IP_VS_DBG(6, "%s(): create a cache_bypass entry\n", __func__);
{
struct ip_vs_conn_param p;
-   ip_vs_conn_fill_param(svc->net, svc->af, iph->protocol,
+   ip_vs_conn_fill_param(net_ipvs(svc->net), svc->af, 
iph->protocol,