[PATCH next 28/84] ipvs: Pass ipvs not net to __ip_vs_get_timeouts

[Eric W. Biederman]

Signed-off-by: "Eric W. Biederman" 
---
 net/netfilter/ipvs/ip_vs_ctl.c | 11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
index 6c06e9a8414d..e509c27f7292 100644
--- a/net/netfilter/ipvs/ip_vs_ctl.c
+++ b/net/netfilter/ipvs/ip_vs_ctl.c
@@ -2584,10 +2584,9 @@ __ip_vs_get_dest_entries(struct netns_ipvs *ipvs, const 
struct ip_vs_get_dests *
 }
 
 static inline void
-__ip_vs_get_timeouts(struct net *net, struct ip_vs_timeout_user *u)
+__ip_vs_get_timeouts(struct netns_ipvs *ipvs, struct ip_vs_timeout_user *u)
 {
 #if defined(CONFIG_IP_VS_PROTO_TCP) || defined(CONFIG_IP_VS_PROTO_UDP)
-   struct netns_ipvs *ipvs = net_ipvs(net);
struct ip_vs_proto_data *pd;
 #endif
 
@@ -2768,7 +2767,7 @@ do_ip_vs_get_ctl(struct sock *sk, int cmd, void __user 
*user, int *len)
{
struct ip_vs_timeout_user t;
 
-   __ip_vs_get_timeouts(net, );
+   __ip_vs_get_timeouts(ipvs, );
if (copy_to_user(user, , sizeof(t)) != 0)
ret = -EFAULT;
}
@@ -3461,7 +3460,7 @@ static int ip_vs_genl_set_config(struct net *net, struct 
nlattr **attrs)
struct netns_ipvs *ipvs = net_ipvs(net);
struct ip_vs_timeout_user t;
 
-   __ip_vs_get_timeouts(net, );
+   __ip_vs_get_timeouts(ipvs, );
 
if (attrs[IPVS_CMD_ATTR_TIMEOUT_TCP])
t.tcp_timeout = nla_get_u32(attrs[IPVS_CMD_ATTR_TIMEOUT_TCP]);
@@ -3637,8 +3636,10 @@ static int ip_vs_genl_get_cmd(struct sk_buff *skb, 
struct genl_info *info)
void *reply;
int ret, cmd, reply_cmd;
struct net *net;
+   struct netns_ipvs *ipvs;
 
net = skb_sknet(skb);
+   ipvs = net_ipvs(net);
cmd = info->genlhdr->cmd;
 
if (cmd == IPVS_CMD_GET_SERVICE)
@@ -3688,7 +3689,7 @@ static int ip_vs_genl_get_cmd(struct sk_buff *skb, struct 
genl_info *info)
{
struct ip_vs_timeout_user t;
 
-   __ip_vs_get_timeouts(net, );
+   __ip_vs_get_timeouts(ipvs, );
 #ifdef CONFIG_IP_VS_PROTO_TCP
if (nla_put_u32(msg, IPVS_CMD_ATTR_TIMEOUT_TCP,
t.tcp_timeout) ||
-- 
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 28/84] ipvs: Pass ipvs not net to __ip_vs_get_timeouts

[Eric W. Biederman]

Signed-off-by: "Eric W. Biederman" 
---
 net/netfilter/ipvs/ip_vs_ctl.c | 11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
index 176068c3a7fe..4ca8d64ab6f1 100644
--- a/net/netfilter/ipvs/ip_vs_ctl.c
+++ b/net/netfilter/ipvs/ip_vs_ctl.c
@@ -2584,10 +2584,9 @@ __ip_vs_get_dest_entries(struct netns_ipvs *ipvs, const 
struct ip_vs_get_dests *
 }
 
 static inline void
-__ip_vs_get_timeouts(struct net *net, struct ip_vs_timeout_user *u)
+__ip_vs_get_timeouts(struct netns_ipvs *ipvs, struct ip_vs_timeout_user *u)
 {
 #if defined(CONFIG_IP_VS_PROTO_TCP) || defined(CONFIG_IP_VS_PROTO_UDP)
-   struct netns_ipvs *ipvs = net_ipvs(net);
struct ip_vs_proto_data *pd;
 #endif
 
@@ -2768,7 +2767,7 @@ do_ip_vs_get_ctl(struct sock *sk, int cmd, void __user 
*user, int *len)
{
struct ip_vs_timeout_user t;
 
-   __ip_vs_get_timeouts(net, );
+   __ip_vs_get_timeouts(ipvs, );
if (copy_to_user(user, , sizeof(t)) != 0)
ret = -EFAULT;
}
@@ -3461,7 +3460,7 @@ static int ip_vs_genl_set_config(struct net *net, struct 
nlattr **attrs)
struct netns_ipvs *ipvs = net_ipvs(net);
struct ip_vs_timeout_user t;
 
-   __ip_vs_get_timeouts(net, );
+   __ip_vs_get_timeouts(ipvs, );
 
if (attrs[IPVS_CMD_ATTR_TIMEOUT_TCP])
t.tcp_timeout = nla_get_u32(attrs[IPVS_CMD_ATTR_TIMEOUT_TCP]);
@@ -3637,8 +3636,10 @@ static int ip_vs_genl_get_cmd(struct sk_buff *skb, 
struct genl_info *info)
void *reply;
int ret, cmd, reply_cmd;
struct net *net;
+   struct netns_ipvs *ipvs;
 
net = skb_sknet(skb);
+   ipvs = net_ipvs(net);
cmd = info->genlhdr->cmd;
 
if (cmd == IPVS_CMD_GET_SERVICE)
@@ -3688,7 +3689,7 @@ static int ip_vs_genl_get_cmd(struct sk_buff *skb, struct 
genl_info *info)
{
struct ip_vs_timeout_user t;
 
-   __ip_vs_get_timeouts(net, );
+   __ip_vs_get_timeouts(ipvs, );
 #ifdef CONFIG_IP_VS_PROTO_TCP
if (nla_put_u32(msg, IPVS_CMD_ATTR_TIMEOUT_TCP,
t.tcp_timeout) ||
-- 
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