Merge branch 'for-linus' into work.misc

This commit is contained in:
Al Viro 2016-01-08 21:20:11 -05:00
commit 6108209c4a
77 changed files with 855 additions and 568 deletions

View file

@ -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);