From 66459299fbe9a7b838391a3a774f927b1528bbe8 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Wed, 5 Oct 2011 03:24:43 +0000 Subject: [PATCH] --- yaml --- r: 264283 b: refs/heads/master c: 3458e21c0d384ca04b27a2ea24d9314c1b57530f h: refs/heads/master i: 264281: 28b30e04647aa4ad99a119cc67b2df0ac7d69696 264279: 5a8fbb8b8c300dce47f7286bb08948202dc88b36 v: v3 --- [refs] | 2 +- trunk/net/netfilter/ipvs/ip_vs_ctl.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 0679521f0e58..e00e44c64893 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1e5289e121372a3494402b1b131b41bfe1cf9b7f +refs/heads/master: 3458e21c0d384ca04b27a2ea24d9314c1b57530f diff --git a/trunk/net/netfilter/ipvs/ip_vs_ctl.c b/trunk/net/netfilter/ipvs/ip_vs_ctl.c index 2b771dc708a3..5290ac353a5e 100644 --- a/trunk/net/netfilter/ipvs/ip_vs_ctl.c +++ b/trunk/net/netfilter/ipvs/ip_vs_ctl.c @@ -3679,7 +3679,7 @@ int __net_init ip_vs_control_net_init(struct net *net) int idx; struct netns_ipvs *ipvs = net_ipvs(net); - ipvs->rs_lock = __RW_LOCK_UNLOCKED(ipvs->rs_lock); + rwlock_init(&ipvs->rs_lock); /* Initialize rs_table */ for (idx = 0; idx < IP_VS_RTAB_SIZE; idx++)