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_expect.c | |
| parent | 9811600f7c1f18152430c6b93b0a76fdd88a59ce (diff) | |
| download | op-kernel-dev-0e60ebe04c51807db972d03665651ae6b5c26d7e.zip op-kernel-dev-0e60ebe04c51807db972d03665651ae6b5c26d7e.tar.gz | |
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_expect.c')
| -rw-r--r-- | net/netfilter/nf_conntrack_expect.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/netfilter/nf_conntrack_expect.c b/net/netfilter/nf_conntrack_expect.c index 46e8966..cab196c 100644 --- a/net/netfilter/nf_conntrack_expect.c +++ b/net/netfilter/nf_conntrack_expect.c @@ -482,7 +482,7 @@ static struct hlist_node *ct_expect_get_first(struct seq_file *seq) struct hlist_node *n; for (st->bucket = 0; st->bucket < nf_ct_expect_hsize; st->bucket++) { - n = rcu_dereference(net->ct.expect_hash[st->bucket].first); + n = rcu_dereference(hlist_first_rcu(&net->ct.expect_hash[st->bucket])); if (n) return n; } @@ -495,11 +495,11 @@ static struct hlist_node *ct_expect_get_next(struct seq_file *seq, struct net *net = seq_file_net(seq); struct ct_expect_iter_state *st = seq->private; - head = rcu_dereference(head->next); + head = rcu_dereference(hlist_next_rcu(head)); while (head == NULL) { if (++st->bucket >= nf_ct_expect_hsize) return NULL; - head = rcu_dereference(net->ct.expect_hash[st->bucket].first); + head = rcu_dereference(hlist_first_rcu(&net->ct.expect_hash[st->bucket])); } return head; } |
