mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-12-27 10:01:39 -05:00
ns: use inode initializer for initial namespaces
Just use the common helper we have. Signed-off-by: Christian Brauner <brauner@kernel.org>
This commit is contained in:
@@ -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),
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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,
|
||||
};
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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,
|
||||
};
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user