Commit e3f0d761 authored Sep 23, 2019 by Paul E. McKenney

net/core: 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>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Jiri Pirko <jiri@mellanox.com>
Cc: Eric Dumazet <edumazet@google.com>
Cc: Ido Schimmel <idosch@mellanox.com>
Cc: Petr Machata <petrm@mellanox.com>
Cc: Paolo Abeni <pabeni@redhat.com>
Cc: <netdev@vger.kernel.org>

parent 6092f726

net/core/dev.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1288,7 +1288,7 @@ int dev_set_alias(struct net_device dev, const char alias, size_t len)
		}

		mutex_lock(&ifalias_mutex);
		rcu_swap_protected(dev->ifalias, new_alias,
		new_alias = rcu_replace_pointer(dev->ifalias, new_alias,
		mutex_is_locked(&ifalias_mutex));
		mutex_unlock(&ifalias_mutex);

net/core/sock_reuseport.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -356,7 +356,7 @@ int reuseport_detach_prog(struct sock *sk)
		spin_lock_bh(&reuseport_lock);
		reuse = rcu_dereference_protected(sk->sk_reuseport_cb,
		lockdep_is_held(&reuseport_lock));
		rcu_swap_protected(reuse->prog, old_prog,
		old_prog = rcu_replace_pointer(reuse->prog, old_prog,
		lockdep_is_held(&reuseport_lock));
		spin_unlock_bh(&reuseport_lock);

Admin message