summaryrefslogtreecommitdiffstats
path: root/net/netfilter/ipvs/ip_vs_ctl.c
diff options
context:
space:
mode:
authorJulian Anastasov <ja@ssi.bg>2013-03-22 11:46:38 +0200
committerPablo Neira Ayuso <pablo@netfilter.org>2013-04-02 00:23:48 +0200
commitfca9c20ae1e510525f8a2aaa25861789fd721193 (patch)
tree810ace8990d277c3dbad6632919b605c85ad316e /net/netfilter/ipvs/ip_vs_ctl.c
parent6b6df46663e7aa6f7b1d82435a3488f9b81316b3 (diff)
downloadlinux-stable-fca9c20ae1e510525f8a2aaa25861789fd721193.tar.gz
linux-stable-fca9c20ae1e510525f8a2aaa25861789fd721193.tar.bz2
linux-stable-fca9c20ae1e510525f8a2aaa25861789fd721193.zip
ipvs: add ip_vs_dest_hold and ip_vs_dest_put
ip_vs_dest_hold will be used under RCU lock while ip_vs_dest_put can be called even after dest is removed from service, as it happens for conns and some schedulers. Signed-off-by: Julian Anastasov <ja@ssi.bg> Signed-off-by: Simon Horman <horms@verge.net.au>
Diffstat (limited to 'net/netfilter/ipvs/ip_vs_ctl.c')
-rw-r--r--net/netfilter/ipvs/ip_vs_ctl.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
index d64f800a3426..a4f638880470 100644
--- a/net/netfilter/ipvs/ip_vs_ctl.c
+++ b/net/netfilter/ipvs/ip_vs_ctl.c
@@ -616,7 +616,7 @@ struct ip_vs_dest *ip_vs_find_dest(struct net *net, int af,
if (!dest)
dest = ip_vs_lookup_dest(svc, daddr, port ^ dport);
if (dest)
- atomic_inc(&dest->refcnt);
+ ip_vs_dest_hold(dest);
ip_vs_service_put(svc);
return dest;
}
@@ -1056,7 +1056,7 @@ static void __ip_vs_del_dest(struct net *net, struct ip_vs_dest *dest)
ntohs(dest->port),
atomic_read(&dest->refcnt));
list_add(&dest->n_list, &ipvs->dest_trash);
- atomic_inc(&dest->refcnt);
+ ip_vs_dest_hold(dest);
}
}