Skip to content

Commit 7cf7303

Browse files
committed
ns: use inode initializer for initial namespaces
Just use the common helper we have. Signed-off-by: Christian Brauner <brauner@kernel.org>
1 parent d093090 commit 7cf7303

7 files changed

Lines changed: 7 additions & 7 deletions

File tree

fs/namespace.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6012,7 +6012,7 @@ SYSCALL_DEFINE4(listmount, const struct mnt_id_req __user *, req,
60126012
}
60136013

60146014
struct mnt_namespace init_mnt_ns = {
6015-
.ns.inum = PROC_MNT_INIT_INO,
6015+
.ns.inum = ns_init_inum(&init_mnt_ns),
60166016
.ns.ops = &mntns_operations,
60176017
.user_ns = &init_user_ns,
60186018
.ns.__ns_ref = REFCOUNT_INIT(1),

init/version-timestamp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ struct uts_namespace init_uts_ns = {
1818
.domainname = UTS_DOMAINNAME,
1919
},
2020
.user_ns = &init_user_ns,
21-
.ns.inum = PROC_UTS_INIT_INO,
21+
.ns.inum = ns_init_inum(&init_uts_ns),
2222
#ifdef CONFIG_UTS_NS
2323
.ns.ops = &utsns_operations,
2424
#endif

ipc/msgutil.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ DEFINE_SPINLOCK(mq_lock);
2929
struct ipc_namespace init_ipc_ns = {
3030
.ns.__ns_ref = REFCOUNT_INIT(1),
3131
.user_ns = &init_user_ns,
32-
.ns.inum = PROC_IPC_INIT_INO,
32+
.ns.inum = ns_init_inum(&init_ipc_ns),
3333
#ifdef CONFIG_IPC_NS
3434
.ns.ops = &ipcns_operations,
3535
#endif

kernel/cgroup/cgroup.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ struct cgroup_namespace init_cgroup_ns = {
222222
.ns.__ns_ref = REFCOUNT_INIT(2),
223223
.user_ns = &init_user_ns,
224224
.ns.ops = &cgroupns_operations,
225-
.ns.inum = PROC_CGROUP_INIT_INO,
225+
.ns.inum = ns_init_inum(&init_cgroup_ns),
226226
.root_cset = &init_css_set,
227227
};
228228

kernel/pid.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ struct pid_namespace init_pid_ns = {
7777
.level = 0,
7878
.child_reaper = &init_task,
7979
.user_ns = &init_user_ns,
80-
.ns.inum = PROC_PID_INIT_INO,
80+
.ns.inum = ns_init_inum(&init_pid_ns),
8181
#ifdef CONFIG_PID_NS
8282
.ns.ops = &pidns_operations,
8383
#endif

kernel/time/namespace.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,7 @@ const struct proc_ns_operations timens_for_children_operations = {
482482
struct time_namespace init_time_ns = {
483483
.ns.__ns_ref = REFCOUNT_INIT(3),
484484
.user_ns = &init_user_ns,
485-
.ns.inum = PROC_TIME_INIT_INO,
485+
.ns.inum = ns_init_inum(&init_time_ns),
486486
.ns.ops = &timens_operations,
487487
.frozen_offsets = true,
488488
};

kernel/user.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ struct user_namespace init_user_ns = {
6868
.ns.__ns_ref = REFCOUNT_INIT(3),
6969
.owner = GLOBAL_ROOT_UID,
7070
.group = GLOBAL_ROOT_GID,
71-
.ns.inum = PROC_USER_INIT_INO,
71+
.ns.inum = ns_init_inum(&init_user_ns),
7272
#ifdef CONFIG_USER_NS
7373
.ns.ops = &userns_operations,
7474
#endif

0 commit comments

Comments
 (0)