summaryrefslogtreecommitdiff
path: root/kernel/user.c
diff options
context:
space:
mode:
authorChristian Brauner <brauner@kernel.org>2025-11-03 16:16:01 +0100
committerChristian Brauner <brauner@kernel.org>2025-11-03 17:41:16 +0100
commit0b1765830cf9c652f010e9f5df7d9fa435a2f930 (patch)
treeb29b2d07920999e3b32e76ac34f2951fcd7b255e /kernel/user.c
parentd915fe20e5cba4bd50e41e792a32dcddc7490e25 (diff)
ns: use NS_COMMON_INIT() for all namespaces
Now that we have a common initializer use it for all static namespaces. Signed-off-by: Christian Brauner <brauner@kernel.org>
Diffstat (limited to 'kernel/user.c')
-rw-r--r--kernel/user.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/kernel/user.c b/kernel/user.c
index 0163665914c9..4b3132e786d9 100644
--- a/kernel/user.c
+++ b/kernel/user.c
@@ -35,6 +35,7 @@ EXPORT_SYMBOL_GPL(init_binfmt_misc);
* and 1 for... ?
*/
struct user_namespace init_user_ns = {
+ .ns = NS_COMMON_INIT(init_user_ns, 3),
.uid_map = {
{
.extent[0] = {
@@ -65,14 +66,8 @@ struct user_namespace init_user_ns = {
.nr_extents = 1,
},
},
- .ns.ns_type = ns_common_type(&init_user_ns),
- .ns.__ns_ref = REFCOUNT_INIT(3),
.owner = GLOBAL_ROOT_UID,
.group = GLOBAL_ROOT_GID,
- .ns.inum = ns_init_inum(&init_user_ns),
-#ifdef CONFIG_USER_NS
- .ns.ops = &userns_operations,
-#endif
.flags = USERNS_INIT_FLAGS,
#ifdef CONFIG_KEYS
.keyring_name_list = LIST_HEAD_INIT(init_user_ns.keyring_name_list),