netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Pablo Neira Ayuso <pablo@netfilter.org>
To: netfilter-devel@vger.kernel.org
Cc: davem@davemloft.net, netdev@vger.kernel.org
Subject: [PATCH 04/10] ipvs: fix sparse warnings in lblc and lblcr
Date: Thu, 25 Apr 2013 02:22:15 +0200	[thread overview]
Message-ID: <1366849341-10466-5-git-send-email-pablo@netfilter.org> (raw)
In-Reply-To: <1366849341-10466-1-git-send-email-pablo@netfilter.org>

From: Julian Anastasov <ja@ssi.bg>

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>
---
 net/netfilter/ipvs/ip_vs_lblc.c  |    2 +-
 net/netfilter/ipvs/ip_vs_lblcr.c |    2 +-
 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 b2cc252..5ea26bd 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 {
  */
 struct ip_vs_lblc_table {
 	struct rcu_head		rcu_head;
-	struct hlist_head __rcu bucket[IP_VS_LBLC_TAB_SIZE];  /* hash bucket */
+	struct hlist_head	bucket[IP_VS_LBLC_TAB_SIZE];  /* hash bucket */
 	struct timer_list       periodic_timer; /* collect stale entries */
 	atomic_t                entries;        /* number of entries */
 	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 feb9656..50123c2 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 {
  */
 struct ip_vs_lblcr_table {
 	struct rcu_head		rcu_head;
-	struct hlist_head __rcu bucket[IP_VS_LBLCR_TAB_SIZE];  /* hash bucket */
+	struct hlist_head	bucket[IP_VS_LBLCR_TAB_SIZE];  /* hash bucket */
 	atomic_t                entries;        /* number of entries */
 	int                     max_size;       /* maximum size of entries */
 	struct timer_list       periodic_timer; /* collect stale entries */
-- 
1.7.10.4

  parent reply	other threads:[~2013-04-25  0:22 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-04-25  0:22 [PATCH 00/10] netfilter fixes for net-next Pablo Neira Ayuso
2013-04-25  0:22 ` [PATCH 01/10] ipvs: properly dereference dest_dst in ip_vs_forget_dev Pablo Neira Ayuso
2013-04-25  0:22 ` [PATCH 02/10] ipvs: fix sparse warnings for ip_vs_conn listing Pablo Neira Ayuso
2013-04-25  0:22 ` [PATCH 03/10] ipvs: fix the remaining sparse warnings in ip_vs_ctl.c Pablo Neira Ayuso
2013-04-25  0:22 ` Pablo Neira Ayuso [this message]
2013-04-25  0:22 ` [PATCH 05/10] ipvs: fix sparse warnings for some parameters Pablo Neira Ayuso
2013-04-25  0:22 ` [PATCH 06/10] ipvs: Avoid shadowing net variable in ip_vs_leave() Pablo Neira Ayuso
2013-04-25  0:22 ` [PATCH 07/10] ipvs: Use min3() in ip_vs_dbg_callid() Pablo Neira Ayuso
2013-04-25  0:22 ` [PATCH 08/10] ipvs: off by one in set_sctp_state() Pablo Neira Ayuso
2013-04-25  0:22 ` [PATCH 09/10] ipvs: Use network byte order for sync message size Pablo Neira Ayuso
2013-04-25  0:22 ` [PATCH 10/10] netfilter: nf_nat: missing condition in nf_xfrm_me_harder() Pablo Neira Ayuso
2013-04-25  4:54 ` [PATCH 00/10] netfilter fixes for net-next David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1366849341-10466-5-git-send-email-pablo@netfilter.org \
    --to=pablo@netfilter.org \
    --cc=davem@davemloft.net \
    --cc=netdev@vger.kernel.org \
    --cc=netfilter-devel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).