diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2016-01-09 03:20:11 +0100 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2016-01-09 03:20:11 +0100 |
| commit | 6108209c4ae964836f6bac5210f1c64153800b62 (patch) | |
| tree | 83651902b46af6bbf8d2ea4841b397bac306095b /lib | |
| parent | fs: use block_device name vsprintf helper (diff) | |
| parent | compat_ioctl: don't call do_ioctl under set_fs(KERNEL_DS) (diff) | |
| download | linux-6108209c4ae964836f6bac5210f1c64153800b62.tar.xz linux-6108209c4ae964836f6bac5210f1c64153800b62.zip | |
Merge branch 'for-linus' into work.misc
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 eb9240c458fa..51282f579760 100644 --- a/lib/rhashtable.c +++ b/lib/rhashtable.c @@ -519,7 +519,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); |