[<prev] [next>] [day] [month] [year] [list]
Message-ID: <157252289477.29376.15790301620769288456.tip-bot2@tip-bot2>
Date: Thu, 31 Oct 2019 11:54:54 -0000
From: "tip-bot2 for Paul E. McKenney" <tip-bot2@...utronix.de>
To: linux-tip-commits@...r.kernel.org
Cc: Linus Torvalds <torvalds@...ux-foundation.org>,
"Paul E. McKenney" <paulmck@...nel.org>,
David Howells <dhowells@...hat.com>,
<linux-afs@...ts.infradead.org>, <linux-kernel@...r.kernel.org>,
Ingo Molnar <mingo@...nel.org>, Borislav Petkov <bp@...en8.de>
Subject: [tip: core/rcu] fs/afs: Replace rcu_swap_protected() with
rcu_replace_pointer()
The following commit has been merged into the core/rcu branch of tip:
Commit-ID: 62860da7082e4f2440c6bc96e4710d9c8bfb916b
Gitweb: https://git.kernel.org/tip/62860da7082e4f2440c6bc96e4710d9c8bfb916b
Author: Paul E. McKenney <paulmck@...nel.org>
AuthorDate: Mon, 23 Sep 2019 15:28:28 -07:00
Committer: Paul E. McKenney <paulmck@...nel.org>
CommitterDate: Wed, 30 Oct 2019 08:44:27 -07:00
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@...ux-foundation.org>
[ paulmck: From rcu_replace() to rcu_replace_pointer() per Ingo Molnar. ]
Signed-off-by: Paul E. McKenney <paulmck@...nel.org>
Acked-by: David Howells <dhowells@...hat.com>
Cc: <linux-afs@...ts.infradead.org>
Cc: <linux-kernel@...r.kernel.org>
---
fs/afs/vl_list.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/fs/afs/vl_list.c b/fs/afs/vl_list.c
index 21eb0c0..8fea54e 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);
}
Powered by blists - more mailing lists