diff options
| author | Eric Dumazet <eric.dumazet@gmail.com> | 2010-11-15 18:17:21 +0100 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2010-11-15 18:17:21 +0100 |
| commit | 0e60ebe04c51807db972d03665651ae6b5c26d7e (patch) | |
| tree | d76ba4540a6eb2008b2035e8f6371597e5ed6a13 /net/netfilter/nf_conntrack_standalone.c | |
| parent | 9811600f7c1f18152430c6b93b0a76fdd88a59ce (diff) | |
| download | kernel_samsung_smdk4412-0e60ebe04c51807db972d03665651ae6b5c26d7e.zip kernel_samsung_smdk4412-0e60ebe04c51807db972d03665651ae6b5c26d7e.tar.gz kernel_samsung_smdk4412-0e60ebe04c51807db972d03665651ae6b5c26d7e.tar.bz2 | |
netfilter: add __rcu annotations
Add some __rcu annotations and use helpers to reduce number of sparse
warnings (CONFIG_SPARSE_RCU_POINTER=y)
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'net/netfilter/nf_conntrack_standalone.c')
| -rw-r--r-- | net/netfilter/nf_conntrack_standalone.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c index 0fb6570..328f1d2 100644 --- a/net/netfilter/nf_conntrack_standalone.c +++ b/net/netfilter/nf_conntrack_standalone.c @@ -29,6 +29,7 @@ #include <net/netfilter/nf_conntrack_helper.h> #include <net/netfilter/nf_conntrack_acct.h> #include <net/netfilter/nf_conntrack_zones.h> +#include <linux/rculist_nulls.h> MODULE_LICENSE("GPL"); @@ -56,7 +57,7 @@ static struct hlist_nulls_node *ct_get_first(struct seq_file *seq) for (st->bucket = 0; st->bucket < net->ct.htable_size; st->bucket++) { - n = rcu_dereference(net->ct.hash[st->bucket].first); + n = rcu_dereference(hlist_nulls_first_rcu(&net->ct.hash[st->bucket])); if (!is_a_nulls(n)) return n; } @@ -69,13 +70,15 @@ static struct hlist_nulls_node *ct_get_next(struct seq_file *seq, struct net *net = seq_file_net(seq); struct ct_iter_state *st = seq->private; - head = rcu_dereference(head->next); + head = rcu_dereference(hlist_nulls_next_rcu(head)); while (is_a_nulls(head)) { if (likely(get_nulls_value(head) == st->bucket)) { if (++st->bucket >= net->ct.htable_size) return NULL; } - head = rcu_dereference(net->ct.hash[st->bucket].first); + head = rcu_dereference( + hlist_nulls_first_rcu( + &net->ct.hash[st->bucket])); } return head; } |