ns: use inode initializer for initial namespaces

Just use the common helper we have.

Signed-off-by: Christian Brauner <brauner@kernel.org>

diff --git a/fs/namespace.c b/fs/namespace.c
index 740a6ba524d0ce7a2f9436405f7a465d71924c23..271cd6294c8a7388e16ad0ba1a7a973fa5ea7202 100644 (file)
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -6012,7 +6012,7 @@ SYSCALL_DEFINE4(listmount, const struct mnt_id_req __user *, req,
 }
 
 struct mnt_namespace init_mnt_ns = {
-       .ns.inum        = PROC_MNT_INIT_INO,
+       .ns.inum        = ns_init_inum(&init_mnt_ns),
        .ns.ops         = &mntns_operations,
        .user_ns        = &init_user_ns,
        .ns.__ns_ref    = REFCOUNT_INIT(1),

diff --git a/init/version-timestamp.c b/init/version-timestamp.c
index 547e522e6016c11a160ea5f98224fde4df24f4d1..376b7c856d4d037b27cb3e4451f2a50087d0a229 100644 (file)
--- a/init/version-timestamp.c
+++ b/init/version-timestamp.c
@@ -18,7 +18,7 @@ struct uts_namespace init_uts_ns = {
                .domainname     = UTS_DOMAINNAME,
        },
        .user_ns = &init_user_ns,
-       .ns.inum = PROC_UTS_INIT_INO,
+       .ns.inum = ns_init_inum(&init_uts_ns),
 #ifdef CONFIG_UTS_NS
        .ns.ops = &utsns_operations,
 #endif

diff --git a/ipc/msgutil.c b/ipc/msgutil.c
index d0f7dcf4c20840d82d00bd9e63a47b6ef96a3199..dca6c8ec8f5ff90d7ef80dc6fb2cd1c748f833d6 100644 (file)
--- a/ipc/msgutil.c
+++ b/ipc/msgutil.c
@@ -29,7 +29,7 @@ DEFINE_SPINLOCK(mq_lock);
 struct ipc_namespace init_ipc_ns = {
        .ns.__ns_ref = REFCOUNT_INIT(1),
        .user_ns = &init_user_ns,
-       .ns.inum = PROC_IPC_INIT_INO,
+       .ns.inum = ns_init_inum(&init_ipc_ns),
 #ifdef CONFIG_IPC_NS
        .ns.ops = &ipcns_operations,
 #endif

diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c
index a0e24adceef005808b99b655cc157051262fc37b..245b43ff2fa481abf232c3fae01ccbec01c2bc97 100644 (file)
--- a/kernel/cgroup/cgroup.c
+++ b/kernel/cgroup/cgroup.c
@@ -222,7 +222,7 @@ struct cgroup_namespace init_cgroup_ns = {
        .ns.__ns_ref    = REFCOUNT_INIT(2),
        .user_ns        = &init_user_ns,
        .ns.ops         = &cgroupns_operations,
-       .ns.inum        = PROC_CGROUP_INIT_INO,
+       .ns.inum        = ns_init_inum(&init_cgroup_ns),
        .root_cset      = &init_css_set,
 };
 

diff --git a/kernel/pid.c b/kernel/pid.c
index e222426f745dd222f11dd4e337db7d1426016c00..7e8c66e0bf676f7b9d042c987302abd9e32686ba 100644 (file)
--- a/kernel/pid.c
+++ b/kernel/pid.c
@@ -77,7 +77,7 @@ struct pid_namespace init_pid_ns = {
        .level = 0,
        .child_reaper = &init_task,
        .user_ns = &init_user_ns,
-       .ns.inum = PROC_PID_INIT_INO,
+       .ns.inum = ns_init_inum(&init_pid_ns),
 #ifdef CONFIG_PID_NS
        .ns.ops = &pidns_operations,
 #endif

diff --git a/kernel/time/namespace.c b/kernel/time/namespace.c
index d70bdfb7b0014acf550bbec01319c985fddad56f..7aa4d6fedd49613d787be8679f4b62ef20b3cb4d 100644 (file)
--- a/kernel/time/namespace.c
+++ b/kernel/time/namespace.c
@@ -482,7 +482,7 @@ const struct proc_ns_operations timens_for_children_operations = {
 struct time_namespace init_time_ns = {
        .ns.__ns_ref    = REFCOUNT_INIT(3),
        .user_ns        = &init_user_ns,
-       .ns.inum        = PROC_TIME_INIT_INO,
+       .ns.inum        = ns_init_inum(&init_time_ns),
        .ns.ops         = &timens_operations,
        .frozen_offsets = true,
 };

diff --git a/kernel/user.c b/kernel/user.c
index 17a742fb4e10eff6d837c4b609052bf0962fae1f..b2a53674d506f805339c7e310cf32bc6756a139e 100644 (file)
--- a/kernel/user.c
+++ b/kernel/user.c
@@ -68,7 +68,7 @@ struct user_namespace init_user_ns = {
        .ns.__ns_ref = REFCOUNT_INIT(3),
        .owner = GLOBAL_ROOT_UID,
        .group = GLOBAL_ROOT_GID,
-       .ns.inum = PROC_USER_INIT_INO,
+       .ns.inum = ns_init_inum(&init_user_ns),
 #ifdef CONFIG_USER_NS
        .ns.ops = &userns_operations,
 #endif