user: port to ns_ref_*() helpers

Stop accessing ns.count directly.

Reviewed-by: Jan Kara <jack@suse.cz>
Signed-off-by: Christian Brauner <brauner@kernel.org>

diff --git a/include/linux/user_namespace.h b/include/linux/user_namespace.h
index a09056ad090e1a23b948a6a20d6ca46624d1e457..9a9aebbf96b9f2a2f44ca4517bc36cdcf0d83c02 100644 (file)
--- a/include/linux/user_namespace.h
+++ b/include/linux/user_namespace.h
@@ -176,7 +176,7 @@ static inline struct user_namespace *to_user_ns(struct ns_common *ns)
 static inline struct user_namespace *get_user_ns(struct user_namespace *ns)
 {
        if (ns)
-               refcount_inc(&ns->ns.count);
+               ns_ref_inc(ns);
        return ns;
 }
 
@@ -186,7 +186,7 @@ extern void __put_user_ns(struct user_namespace *ns);
 
 static inline void put_user_ns(struct user_namespace *ns)
 {
-       if (ns && refcount_dec_and_test(&ns->ns.count))
+       if (ns && ns_ref_put(ns))
                __put_user_ns(ns);
 }
 

diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c
index 32406bcab526fa3ccc899c1e386e1f8ad657dc72..f9df45c46235253039c1d49cc281c59dc41ea51a 100644 (file)
--- a/kernel/user_namespace.c
+++ b/kernel/user_namespace.c
@@ -225,7 +225,7 @@ static void free_user_ns(struct work_struct *work)
                kfree_rcu(ns, ns.ns_rcu);
                dec_user_namespaces(ucounts);
                ns = parent;
-       } while (refcount_dec_and_test(&parent->ns.count));
+       } while (ns_ref_put(parent));
 }
 
 void __put_user_ns(struct user_namespace *ns)