diff options
| author | David S. Miller <davem@davemloft.net> | 2016-01-01 00:20:10 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-01-01 00:20:10 +0100 |
| commit | c07f30ad68053181b3e8a0e65b0630e12e844f91 (patch) | |
| tree | 8758968aabc844c435ff2a5d7d02c835fccd02a3 /lib | |
| parent | Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| parent | Merge tag 'pci-v4.4-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
| download | linux-c07f30ad68053181b3e8a0e65b0630e12e844f91.tar.xz linux-c07f30ad68053181b3e8a0e65b0630e12e844f91.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/rhashtable.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/rhashtable.c b/lib/rhashtable.c index 1c149e9a5cd5..cc808707d1cf 100644 --- a/lib/rhashtable.c +++ b/lib/rhashtable.c @@ -516,7 +516,8 @@ int rhashtable_walk_init(struct rhashtable *ht, struct rhashtable_iter *iter) return -ENOMEM; spin_lock(&ht->lock); - iter->walker->tbl = rht_dereference(ht->tbl, ht); + iter->walker->tbl = + rcu_dereference_protected(ht->tbl, lockdep_is_held(&ht->lock)); list_add(&iter->walker->list, &iter->walker->tbl->walkers); spin_unlock(&ht->lock); |