diff options
| author | Ingo Molnar <mingo@kernel.org> | 2019-10-31 09:33:19 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-10-31 09:33:19 +0100 |
| commit | 43e0ae7ae0f567a3f8c10ec7a4078bc482660921 (patch) | |
| tree | f44975fcd01ee1a6c5f519bf0456e1547a5e3752 /fs | |
| parent | 320000e72ec0613e164ce9608d865396fb2da278 (diff) | |
| parent | 8dcdfb7096a304130ab36fbb0f2961deaf863e5a (diff) | |
| download | linux-43e0ae7ae0f567a3f8c10ec7a4078bc482660921.tar.bz2 | |
Merge branch 'for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu into core/rcu
Pull RCU and LKMM changes from Paul E. McKenney:
- Documentation updates.
- Miscellaneous fixes.
- Dynamic tick (nohz) updates, perhaps most notably changes to
force the tick on when needed due to lengthy in-kernel execution
on CPUs on which RCU is waiting.
- Replace rcu_swap_protected() with rcu_prepace_pointer().
- Torture-test updates.
- Linux-kernel memory consistency model updates.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/afs/vl_list.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/afs/vl_list.c b/fs/afs/vl_list.c index 21eb0c0be912..8fea54eba0c2 100644 --- a/fs/afs/vl_list.c +++ b/fs/afs/vl_list.c @@ -279,8 +279,8 @@ struct afs_vlserver_list *afs_extract_vlserver_list(struct afs_cell *cell, struct afs_addr_list *old = addrs; write_lock(&server->lock); - rcu_swap_protected(server->addresses, old, - lockdep_is_held(&server->lock)); + old = rcu_replace_pointer(server->addresses, old, + lockdep_is_held(&server->lock)); write_unlock(&server->lock); afs_put_addrlist(old); } |