aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulian Anastasov <ja@ssi.bg>2013-04-17 16:50:47 -0400
committerSimon Horman <horms@verge.net.au>2013-04-22 22:43:05 -0400
commitf33c8b94fd51aeb0bc02f87ee172691ddf7936b6 (patch)
tree4a5797180b85792df46633c9027ca94dc1190408
parent371990eeec13f9fdee9a5e1d3d811ad24a5cb25e (diff)
ipvs: fix sparse warnings in lblc and lblcr
kbuild test robot reports for sparse warnings in commits c2a4ffb70eef39 ("ipvs: convert lblc scheduler to rcu") and c5549571f975ab ("ipvs: convert lblcr scheduler to rcu"). Fix it by removing extra __rcu annotation. Signed-off-by: Julian Anastasov <ja@ssi.bg> Signed-off-by: Simon Horman <horms@verge.net.au>
-rw-r--r--net/netfilter/ipvs/ip_vs_lblc.c2
-rw-r--r--net/netfilter/ipvs/ip_vs_lblcr.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/net/netfilter/ipvs/ip_vs_lblc.c b/net/netfilter/ipvs/ip_vs_lblc.c
index b2cc2528a4df..5ea26bd87743 100644
--- a/net/netfilter/ipvs/ip_vs_lblc.c
+++ b/net/netfilter/ipvs/ip_vs_lblc.c
@@ -104,7 +104,7 @@ struct ip_vs_lblc_entry {
104 */ 104 */
105struct ip_vs_lblc_table { 105struct ip_vs_lblc_table {
106 struct rcu_head rcu_head; 106 struct rcu_head rcu_head;
107 struct hlist_head __rcu bucket[IP_VS_LBLC_TAB_SIZE]; /* hash bucket */ 107 struct hlist_head bucket[IP_VS_LBLC_TAB_SIZE]; /* hash bucket */
108 struct timer_list periodic_timer; /* collect stale entries */ 108 struct timer_list periodic_timer; /* collect stale entries */
109 atomic_t entries; /* number of entries */ 109 atomic_t entries; /* number of entries */
110 int max_size; /* maximum size of entries */ 110 int max_size; /* maximum size of entries */
diff --git a/net/netfilter/ipvs/ip_vs_lblcr.c b/net/netfilter/ipvs/ip_vs_lblcr.c
index feb9656eac58..50123c2ab484 100644
--- a/net/netfilter/ipvs/ip_vs_lblcr.c
+++ b/net/netfilter/ipvs/ip_vs_lblcr.c
@@ -284,7 +284,7 @@ struct ip_vs_lblcr_entry {
284 */ 284 */
285struct ip_vs_lblcr_table { 285struct ip_vs_lblcr_table {
286 struct rcu_head rcu_head; 286 struct rcu_head rcu_head;
287 struct hlist_head __rcu bucket[IP_VS_LBLCR_TAB_SIZE]; /* hash bucket */ 287 struct hlist_head bucket[IP_VS_LBLCR_TAB_SIZE]; /* hash bucket */
288 atomic_t entries; /* number of entries */ 288 atomic_t entries; /* number of entries */
289 int max_size; /* maximum size of entries */ 289 int max_size; /* maximum size of entries */
290 struct timer_list periodic_timer; /* collect stale entries */ 290 struct timer_list periodic_timer; /* collect stale entries */