diff options
| author | Thomas Graf <tgraf@suug.ch> | 2015-01-03 01:00:16 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-01-03 22:32:56 +0300 |
| commit | 88d6ed15acff1cb44b1d1f3c0a393b7f7744957a (patch) | |
| tree | ee25a48f8ab11d06c062480c89ba1e96c8113e57 /net/netlink/diag.c | |
| parent | a4b18cda4c2676a4b4b59622b2e0394dc153e00b (diff) | |
| download | linux-88d6ed15acff1cb44b1d1f3c0a393b7f7744957a.tar.xz | |
rhashtable: Convert bucket iterators to take table and index
This patch is in preparation to introduce per bucket spinlocks. It
extends all iterator macros to take the bucket table and bucket
index. It also introduces a new rht_dereference_bucket() to
handle protected accesses to buckets.
It introduces a barrier() to the RCU iterators to the prevent
the compiler from caching the first element.
The lockdep verifier is introduced as stub which always succeeds
and properly implement in the next patch when the locks are
introduced.
Signed-off-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netlink/diag.c')
| -rw-r--r-- | net/netlink/diag.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/netlink/diag.c b/net/netlink/diag.c index de8c74a3c061..fcca36d81a62 100644 --- a/net/netlink/diag.c +++ b/net/netlink/diag.c @@ -113,7 +113,9 @@ static int __netlink_diag_dump(struct sk_buff *skb, struct netlink_callback *cb, req = nlmsg_data(cb->nlh); for (i = 0; i < htbl->size; i++) { - rht_for_each_entry(nlsk, htbl->buckets[i], ht, node) { + struct rhash_head *pos; + + rht_for_each_entry(nlsk, pos, htbl, i, node) { sk = (struct sock *)nlsk; if (!net_eq(sock_net(sk), net)) |