# \[tip: core/rcu\] net/netfilter: Replace rcu\_swap\_protected() with rcu\_replace\_pointer() - From: tip-bot2 for Paul E. McKenney \ - Date: 2019-10-31 11:55:14 - List: netdev - Page: https://ratatoskr.run/netdev/2019/10/5761580 - Thread: https://ratatoskr.run/netfilter-devel/2019/10/5761580/t.md ```text The following commit has been merged into the core/rcu branch of tip: Commit-ID: b685b534bf1586a01b32280d1da39febaf270039 Gitweb: https://git.kernel.org/tip/b685b534bf1586a01b32280d1da39febaf270039 Author: Paul E. McKenney [ref] AuthorDate: Mon, 23 Sep 2019 15:53:02 -07:00 Committer: Paul E. McKenney [ref] CommitterDate: Wed, 30 Oct 2019 08:45:38 -07:00 net/netfilter: 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 [ paulmck: From rcu_replace() to rcu_replace_pointer() per Ingo Molnar. ] Signed-off-by: Paul E. McKenney Acked-by: Pablo Neira Ayuso Cc: Jozsef Kadlecsik Cc: Florian Westphal Cc: "David S. Miller" Cc: Cc: Cc: --- net/netfilter/nf_tables_api.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c index d481f9b..3379974 100644 --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c @@ -1461,8 +1461,9 @@ static void nft_chain_stats_replace(struct nft_trans *trans) if (!nft_trans_chain_stats(trans)) return; - rcu_swap_protected(chain->stats, nft_trans_chain_stats(trans), - lockdep_commit_lock_is_held(trans->ctx.net)); + nft_trans_chain_stats(trans) = + rcu_replace_pointer(chain->stats, nft_trans_chain_stats(trans), + lockdep_commit_lock_is_held(trans->ctx.net)); if (!nft_trans_chain_stats(trans)) static_branch_inc(&nft_counters_enabled); ```