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_dest_trash_expire
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
79ac82e0aa
commit
8e743f1b45
1 changed files with 2 additions and 3 deletions
|
@ -1124,8 +1124,7 @@ ip_vs_del_dest(struct ip_vs_service *svc, struct ip_vs_dest_user_kern *udest)
|
|||
|
||||
static void ip_vs_dest_trash_expire(unsigned long data)
|
||||
{
|
||||
struct net *net = (struct net *) data;
|
||||
struct netns_ipvs *ipvs = net_ipvs(net);
|
||||
struct netns_ipvs *ipvs = (struct netns_ipvs *)data;
|
||||
struct ip_vs_dest *dest, *next;
|
||||
unsigned long now = jiffies;
|
||||
|
||||
|
@ -3966,7 +3965,7 @@ int __net_init ip_vs_control_net_init(struct net *net)
|
|||
INIT_LIST_HEAD(&ipvs->dest_trash);
|
||||
spin_lock_init(&ipvs->dest_trash_lock);
|
||||
setup_timer(&ipvs->dest_trash_timer, ip_vs_dest_trash_expire,
|
||||
(unsigned long) net);
|
||||
(unsigned long) ipvs);
|
||||
atomic_set(&ipvs->ftpsvc_counter, 0);
|
||||
atomic_set(&ipvs->nullsvc_counter, 0);
|
||||
|
||||
|
|
Loading…
Reference in a new issue