summaryrefslogtreecommitdiffstats
path: root/fs/afs
diff options
context:
space:
mode:
authorPaul E. McKenney <paulmck@kernel.org>2019-09-24 00:28:28 +0200
committerPaul E. McKenney <paulmck@kernel.org>2019-10-30 16:44:27 +0100
commit62860da7082e4f2440c6bc96e4710d9c8bfb916b (patch)
tree3e4b5806506c868eb4c0e557ab408670c30f14ef /fs/afs
parentdrivers/scsi: Replace rcu_swap_protected() with rcu_replace_pointer() (diff)
downloadlinux-62860da7082e4f2440c6bc96e4710d9c8bfb916b.tar.xz
linux-62860da7082e4f2440c6bc96e4710d9c8bfb916b.zip
fs/afs: Replace rcu_swap_protected() with rcu_replace_pointer()
This commit replaces the use of rcu_swap_protected() with the more intuitively appealing rcu_replace_pointer() as a step towards removing rcu_swap_protected(). Link: https://lore.kernel.org/lkml/CAHk-=wiAsJLw1egFEE=Z7-GGtM6wcvtyytXZA1+BHqta4gg6Hw@mail.gmail.com/ Reported-by: Linus Torvalds <torvalds@linux-foundation.org> [ paulmck: From rcu_replace() to rcu_replace_pointer() per Ingo Molnar. ] Signed-off-by: Paul E. McKenney <paulmck@kernel.org> Acked-by: David Howells <dhowells@redhat.com> Cc: <linux-afs@lists.infradead.org> Cc: <linux-kernel@vger.kernel.org>
Diffstat (limited to 'fs/afs')
-rw-r--r--fs/afs/vl_list.c4
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);
}