summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>2012-09-05 18:21:53 +0000
committerPablo Neira Ayuso <pablo@netfilter.org>2012-09-10 09:48:55 +0200
commit0edd94887d19ad73539477395c17ea0d6898947a (patch)
tree366912d7f49699052941689f8fe88aad278f8da2
parenta67299556ea1aa56daaeb985fd32295dacecba1a (diff)
downloadlinux-stable-0edd94887d19ad73539477395c17ea0d6898947a.tar.gz
linux-stable-0edd94887d19ad73539477395c17ea0d6898947a.tar.bz2
linux-stable-0edd94887d19ad73539477395c17ea0d6898947a.zip
ipvs: use list_del_init instead of list_del/INIT_LIST_HEAD
Using list_del_init() instead of list_del() + INIT_LIST_HEAD(). spatch with a semantic match is used to found this problem. (http://coccinelle.lip6.fr/) Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn> Acked-by: Simon Horman <horms@verge.net.au> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
-rw-r--r--net/netfilter/ipvs/ip_vs_ctl.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
index 767cc12da0fe..37b38d0791cd 100644
--- a/net/netfilter/ipvs/ip_vs_ctl.c
+++ b/net/netfilter/ipvs/ip_vs_ctl.c
@@ -539,8 +539,7 @@ static int ip_vs_rs_unhash(struct ip_vs_dest *dest)
* Remove it from the rs_table table.
*/
if (!list_empty(&dest->d_list)) {
- list_del(&dest->d_list);
- INIT_LIST_HEAD(&dest->d_list);
+ list_del_init(&dest->d_list);
}
return 1;