[PATCH next 22/84] ipvs: Pass ipvs not net to ip_vs_zero_all

2015-09-21 Thread Eric W. Biederman 
Signed-off-by: "Eric W. Biederman" 
---
 net/netfilter/ipvs/ip_vs_ctl.c | 7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
index a281961a1840..0b7749ae1e8d 100644
--- a/net/netfilter/ipvs/ip_vs_ctl.c
+++ b/net/netfilter/ipvs/ip_vs_ctl.c
@@ -1576,9 +1576,8 @@ static int ip_vs_zero_service(struct ip_vs_service *svc)
return 0;
 }
 
-static int ip_vs_zero_all(struct net *net)
+static int ip_vs_zero_all(struct netns_ipvs *ipvs)
 {
-   struct netns_ipvs *ipvs = net_ipvs(net);
int idx;
struct ip_vs_service *svc;
 
@@ -2384,7 +2383,7 @@ do_ip_vs_set_ctl(struct sock *sk, int cmd, void __user 
*user, unsigned int len)
if (cmd == IP_VS_SO_SET_ZERO) {
/* if no service address is set, zero counters in all */
if (!usvc.fwmark && !usvc.addr.ip && !usvc.port) {
-   ret = ip_vs_zero_all(net);
+   ret = ip_vs_zero_all(ipvs);
goto out_unlock;
}
}
@@ -3530,7 +3529,7 @@ static int ip_vs_genl_set_cmd(struct sk_buff *skb, struct 
genl_info *info)
goto out;
} else if (cmd == IPVS_CMD_ZERO &&
   !info->attrs[IPVS_CMD_ATTR_SERVICE]) {
-   ret = ip_vs_zero_all(net);
+   ret = ip_vs_zero_all(ipvs);
goto out;
}
 
-- 
2.2.1

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH next 22/84] ipvs: Pass ipvs not net to ip_vs_zero_all

2015-09-19 Thread Eric W. Biederman 
Signed-off-by: "Eric W. Biederman" 
---
 net/netfilter/ipvs/ip_vs_ctl.c | 7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
index d3407ad866bb..591f528e4ed6 100644
--- a/net/netfilter/ipvs/ip_vs_ctl.c
+++ b/net/netfilter/ipvs/ip_vs_ctl.c
@@ -1576,9 +1576,8 @@ static int ip_vs_zero_service(struct ip_vs_service *svc)
return 0;
 }
 
-static int ip_vs_zero_all(struct net *net)
+static int ip_vs_zero_all(struct netns_ipvs *ipvs)
 {
-   struct netns_ipvs *ipvs = net_ipvs(net);
int idx;
struct ip_vs_service *svc;
 
@@ -2384,7 +2383,7 @@ do_ip_vs_set_ctl(struct sock *sk, int cmd, void __user 
*user, unsigned int len)
if (cmd == IP_VS_SO_SET_ZERO) {
/* if no service address is set, zero counters in all */
if (!usvc.fwmark && !usvc.addr.ip && !usvc.port) {
-   ret = ip_vs_zero_all(net);
+   ret = ip_vs_zero_all(ipvs);
goto out_unlock;
}
}
@@ -3530,7 +3529,7 @@ static int ip_vs_genl_set_cmd(struct sk_buff *skb, struct 
genl_info *info)
goto out;
} else if (cmd == IPVS_CMD_ZERO &&
   !info->attrs[IPVS_CMD_ATTR_SERVICE]) {
-   ret = ip_vs_zero_all(net);
+   ret = ip_vs_zero_all(ipvs);
goto out;
}
 
-- 
2.2.1

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html