diff options
| author | Ingo Molnar <mingo@kernel.org> | 2020-01-25 12:05:23 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2020-01-25 12:05:23 +0300 |
| commit | f8a4bb6bfa639fbdd07aede615be6dffe86a9713 (patch) | |
| tree | 158a3e44edfd02bb81addfb779ea1850114f3361 /net/tipc | |
| parent | 4703d9119972bf586d2cca76ec6438f819ffa30e (diff) | |
| parent | 0e247386d9ed5ab8b7dad010cf4b183efeb1e47d (diff) | |
| download | linux-f8a4bb6bfa639fbdd07aede615be6dffe86a9713.tar.xz | |
Merge branch 'for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu into core/rcu
Pull RCU updates from Paul E. McKenney:
- Expedited grace-period updates
- kfree_rcu() updates
- RCU list updates
- Preemptible RCU updates
- Torture-test updates
- Miscellaneous fixes
- Documentation updates
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/tipc')
| -rw-r--r-- | net/tipc/crypto.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/net/tipc/crypto.c b/net/tipc/crypto.c index 990a872cec46..c8c47fc72653 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; } |