Messages in this thread Patch in this message | | | Date | Sat, 25 Jan 2020 10:42:48 -0000 | From | "tip-bot2 for Paul E. McKenney" <> | Subject | [tip: core/rcu] net/tipc: Replace rcu_swap_protected() with rcu_replace_pointer() |
| |
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 <paulmck@kernel.org> AuthorDate: Mon, 09 Dec 2019 19:13:45 -08:00 Committer: Paul E. McKenney <paulmck@kernel.org> 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/ Reported-by: Linus Torvalds <torvalds@linux-foundation.org> Reported-by: kbuild test robot <lkp@intel.com> Signed-off-by: Paul E. McKenney <paulmck@kernel.org> [ paulmck: Updated based on Ying Xue and Tuong Lien Tong feedback. ] Cc: Jon Maloy <jon.maloy@ericsson.com> Cc: Ying Xue <ying.xue@windriver.com> Cc: "David S. Miller" <davem@davemloft.net> Cc: <netdev@vger.kernel.org> Cc: <tipc-discussion@lists.sourceforge.net> --- 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; }
| |