diff options
| author | Paul E. McKenney <paulmck@kernel.org> | 2019-09-23 16:09:18 -0700 |
|---|---|---|
| committer | Paul E. McKenney <paulmck@kernel.org> | 2019-10-30 08:45:48 -0700 |
| commit | 445d3749315f34229dcfc3efd82796f97fc72e92 (patch) | |
| tree | 29d6d560a389ce60f746abcd458f3ea627ba92a0 /net/sched/act_mpls.c | |
| parent | b685b534bf1586a01b32280d1da39febaf270039 (diff) | |
| download | linux-445d3749315f34229dcfc3efd82796f97fc72e92.tar.bz2 | |
net/sched: 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: Jamal Hadi Salim <jhs@mojatatu.com>
Cc: Cong Wang <xiyou.wangcong@gmail.com>
Cc: Jiri Pirko <jiri@resnulli.us>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: <netdev@vger.kernel.org>
Cc: <linux-kernel@vger.kernel.org>
Diffstat (limited to 'net/sched/act_mpls.c')
| -rw-r--r-- | net/sched/act_mpls.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sched/act_mpls.c b/net/sched/act_mpls.c index e168df0e008a..5b3031c3e81d 100644 --- a/net/sched/act_mpls.c +++ b/net/sched/act_mpls.c @@ -258,7 +258,7 @@ static int tcf_mpls_init(struct net *net, struct nlattr *nla, spin_lock_bh(&m->tcf_lock); goto_ch = tcf_action_set_ctrlact(*a, parm->action, goto_ch); - rcu_swap_protected(m->mpls_p, p, lockdep_is_held(&m->tcf_lock)); + p = rcu_replace_pointer(m->mpls_p, p, lockdep_is_held(&m->tcf_lock)); spin_unlock_bh(&m->tcf_lock); if (goto_ch) |