mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-04 09:59:32 +00:00
ipvs: Pass ipvs not net to __ip_vs_get_timeouts
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com> Acked-by: Julian Anastasov <ja@ssi.bg> Signed-off-by: Simon Horman <horms@verge.net.au>
This commit is contained in:
parent
08fff4c357
commit
af5403419d
1 changed files with 6 additions and 5 deletions
|
@ -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, &t);
|
||||
__ip_vs_get_timeouts(ipvs, &t);
|
||||
if (copy_to_user(user, &t, 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, &t);
|
||||
__ip_vs_get_timeouts(ipvs, &t);
|
||||
|
||||
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, &t);
|
||||
__ip_vs_get_timeouts(ipvs, &t);
|
||||
#ifdef CONFIG_IP_VS_PROTO_TCP
|
||||
if (nla_put_u32(msg, IPVS_CMD_ATTR_TIMEOUT_TCP,
|
||||
t.tcp_timeout) ||
|
||||
|
|
Loading…
Reference in a new issue