From: "Paul E. McKenney" <paul...@kernel.org>

This commit replaces the use of rcu_swap_protected() with the more
intuitively appealing rcu_replace() as a step towards removing
rcu_swap_protected().

Link: 
https://lore.kernel.org/lkml/CAHk-=wiAsJLw1egFEE=z7-ggtm6wcvtyytxza1+bhqta4gg...@mail.gmail.com/
Reported-by: Linus Torvalds <torva...@linux-foundation.org>
Reported-by: Reported-by: kbuild test robot <l...@intel.com>
[ paulmck: From rcu_replace() to rcu_replace_pointer() per Ingo Molnar. ]
Signed-off-by: Paul E. McKenney <paul...@kernel.org>
Cc: Micah Morton <mort...@chromium.org>
Cc: James Morris <jmor...@namei.org>
Cc: "Serge E. Hallyn" <se...@hallyn.com>
Cc: <linux-security-mod...@vger.kernel.org>
---
 security/safesetid/securityfs.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/security/safesetid/securityfs.c b/security/safesetid/securityfs.c
index 74a13d4..f8bc574 100644
--- a/security/safesetid/securityfs.c
+++ b/security/safesetid/securityfs.c
@@ -179,8 +179,8 @@ static ssize_t handle_policy_update(struct file *file,
         * doesn't currently exist, just use a spinlock for now.
         */
        mutex_lock(&policy_update_lock);
-       rcu_swap_protected(safesetid_setuid_rules, pol,
-                          lockdep_is_held(&policy_update_lock));
+       pol = rcu_replace_pointer(safesetid_setuid_rules, pol,
+                                 lockdep_is_held(&policy_update_lock));
        mutex_unlock(&policy_update_lock);
        err = len;
 
-- 
2.9.5

Reply via email to