[tip: core/rcu] net/tipc: Replace rcu_swap_protected() with rcu_replace_pointer()
From: tip-bot2 for Paul E. McKenney <hidden>
Date: 2020-01-25 10:43:43
Also in:
lkml
Subsystem:
networking [general], the rest, tipc network layer · Maintainers:
"David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds, Jon Maloy, Tung Quang Nguyen
The following commit has been merged into the core/rcu branch of tip: Commit-ID: 1a271ebbfe33a44f61e02d35a2950ab00b32850b Gitweb: https://git.kernel.org/tip/1a271ebbfe33a44f61e02d35a2950ab00b32850b Author: Paul E. McKenney [off-list ref] AuthorDate: Mon, 09 Dec 2019 19:13:45 -08:00 Committer: Paul E. McKenney [off-list ref] CommitterDate: Thu, 12 Dec 2019 10:19:40 -08:00 net/tipc: 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/ (local) Reported-by: Linus Torvalds <torvalds@linux-foundation.org> Reported-by: kbuild test robot <redacted> Signed-off-by: Paul E. McKenney <paulmck@kernel.org> [ paulmck: Updated based on Ying Xue and Tuong Lien Tong feedback. ] Cc: Jon Maloy <redacted> Cc: Ying Xue <redacted> Cc: "David S. Miller" <davem@davemloft.net> Cc: <redacted> Cc: <redacted> --- net/tipc/crypto.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/net/tipc/crypto.c b/net/tipc/crypto.c
index 990a872..c8c47fc 100644
--- a/net/tipc/crypto.c
+++ b/net/tipc/crypto.c@@ -257,9 +257,6 @@ static char *tipc_key_change_dump(struct tipc_key old, struct tipc_key new, #define tipc_aead_rcu_ptr(rcu_ptr, lock) \ rcu_dereference_protected((rcu_ptr), lockdep_is_held(lock)) -#define tipc_aead_rcu_swap(rcu_ptr, ptr, lock) \ - rcu_swap_protected((rcu_ptr), (ptr), lockdep_is_held(lock)) - #define tipc_aead_rcu_replace(rcu_ptr, ptr, lock) \ do { \ typeof(rcu_ptr) __tmp = rcu_dereference_protected((rcu_ptr), \
@@ -1189,7 +1186,7 @@ static bool tipc_crypto_key_try_align(struct tipc_crypto *rx, u8 new_pending) /* Move passive key if any */ if (key.passive) { - tipc_aead_rcu_swap(rx->aead[key.passive], tmp2, &rx->lock); + tmp2 = rcu_replace_pointer(rx->aead[key.passive], tmp2, lockdep_is_held(&rx->lock)); x = (key.passive - key.pending + new_pending) % KEY_MAX; new_passive = (x <= 0) ? x + KEY_MAX : x; }