[PATCH 13/32] user: use ns_common_init()

Christian Brauner posted 32 patches 9 hours ago
[PATCH 13/32] user: use ns_common_init()
Posted by Christian Brauner 9 hours ago
Don't cargo-cult the same thing over and over.

Signed-off-by: Christian Brauner <brauner@kernel.org>
---
 kernel/user_namespace.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c
index 682f40d5632d..98f4fe84d039 100644
--- a/kernel/user_namespace.c
+++ b/kernel/user_namespace.c
@@ -124,12 +124,11 @@ int create_user_ns(struct cred *new)
 		goto fail_dec;
 
 	ns->parent_could_setfcap = cap_raised(new->cap_effective, CAP_SETFCAP);
-	ret = ns_alloc_inum(&ns->ns);
+
+	ret = ns_common_init(&ns->ns, &userns_operations, true);
 	if (ret)
 		goto fail_free;
-	ns->ns.ops = &userns_operations;
 
-	refcount_set(&ns->ns.count, 1);
 	/* Leave the new->user_ns reference with the new user namespace. */
 	ns->parent = parent_ns;
 	ns->level = parent_ns->level + 1;

-- 
2.47.3
Re: [PATCH 13/32] user: use ns_common_init()
Posted by Jan Kara 7 hours ago
On Wed 10-09-25 16:36:58, Christian Brauner wrote:
> Don't cargo-cult the same thing over and over.
> 
> Signed-off-by: Christian Brauner <brauner@kernel.org>

Looks good. Feel free to add:

Reviewed-by: Jan Kara <jack@suse.cz>

								Honza

> ---
>  kernel/user_namespace.c | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c
> index 682f40d5632d..98f4fe84d039 100644
> --- a/kernel/user_namespace.c
> +++ b/kernel/user_namespace.c
> @@ -124,12 +124,11 @@ int create_user_ns(struct cred *new)
>  		goto fail_dec;
>  
>  	ns->parent_could_setfcap = cap_raised(new->cap_effective, CAP_SETFCAP);
> -	ret = ns_alloc_inum(&ns->ns);
> +
> +	ret = ns_common_init(&ns->ns, &userns_operations, true);
>  	if (ret)
>  		goto fail_free;
> -	ns->ns.ops = &userns_operations;
>  
> -	refcount_set(&ns->ns.count, 1);
>  	/* Leave the new->user_ns reference with the new user namespace. */
>  	ns->parent = parent_ns;
>  	ns->level = parent_ns->level + 1;
> 
> -- 
> 2.47.3
> 
-- 
Jan Kara <jack@suse.com>
SUSE Labs, CR