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_zero_all
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
56d2169b77
commit
c60856c687
1 changed files with 3 additions and 4 deletions
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue