Unverified Commit 0b176583 authored by Christian Brauner's avatar Christian Brauner
Browse files

ns: use NS_COMMON_INIT() for all namespaces 



Now that we have a common initializer use it for all static namespaces.

Signed-off-by: default avatarChristian Brauner <brauner@kernel.org>
parent d915fe20

fs/namespace.c

+1 −4
Original line number Diff line number Diff line
@@ -5985,11 +5985,8 @@ SYSCALL_DEFINE4(listmount, const struct mnt_id_req __user *, req, 
}



struct mnt_namespace init_mnt_ns = {

	.ns.inum	= ns_init_inum(&init_mnt_ns),

	.ns.ops		= &mntns_operations,

	.ns		= NS_COMMON_INIT(init_mnt_ns, 1),

	.user_ns	= &init_user_ns,

	.ns.__ns_ref	= REFCOUNT_INIT(1),

	.ns.ns_type	= ns_common_type(&init_mnt_ns),

	.passive	= REFCOUNT_INIT(1),

	.mounts		= RB_ROOT,

	.poll		= __WAIT_QUEUE_HEAD_INITIALIZER(init_mnt_ns.poll),

init/version-timestamp.c

+1 −6
Original line number Diff line number Diff line
@@ -8,8 +8,7 @@ 
#include <linux/utsname.h>



struct uts_namespace init_uts_ns = {

	.ns.ns_type = ns_common_type(&init_uts_ns),

	.ns.__ns_ref = REFCOUNT_INIT(2),

	.ns = NS_COMMON_INIT(init_uts_ns, 2),

	.name = {

		.sysname	= UTS_SYSNAME,

		.nodename	= UTS_NODENAME,
@@ -19,10 +18,6 @@ struct uts_namespace init_uts_ns = { 
		.domainname	= UTS_DOMAINNAME,

	},

	.user_ns = &init_user_ns,

	.ns.inum = ns_init_inum(&init_uts_ns),

#ifdef CONFIG_UTS_NS

	.ns.ops = &utsns_operations,

#endif

};



/* FIXED STRINGS! Don't touch! */

ipc/msgutil.c

+1 −6
Original line number Diff line number Diff line
@@ -27,13 +27,8 @@ DEFINE_SPINLOCK(mq_lock); 
 * and not CONFIG_IPC_NS.

 */

struct ipc_namespace init_ipc_ns = {

	.ns.__ns_ref = REFCOUNT_INIT(1),

	.ns = NS_COMMON_INIT(init_ipc_ns, 1),

	.user_ns = &init_user_ns,

	.ns.inum = ns_init_inum(&init_ipc_ns),

#ifdef CONFIG_IPC_NS

	.ns.ops = &ipcns_operations,

#endif

	.ns.ns_type = ns_common_type(&init_ipc_ns),

};



struct msg_msgseg {

kernel/cgroup/cgroup.c

+1 −4
Original line number Diff line number Diff line
@@ -250,12 +250,9 @@ bool cgroup_enable_per_threadgroup_rwsem __read_mostly; 


/* cgroup namespace for init task */

struct cgroup_namespace init_cgroup_ns = {

	.ns.__ns_ref	= REFCOUNT_INIT(2),

	.ns		= NS_COMMON_INIT(init_cgroup_ns, 2),

	.user_ns	= &init_user_ns,

	.ns.ops		= &cgroupns_operations,

	.ns.inum	= ns_init_inum(&init_cgroup_ns),

	.root_cset	= &init_css_set,

	.ns.ns_type	= ns_common_type(&init_cgroup_ns),

};



static struct file_system_type cgroup2_fs_type;

kernel/pid.c

+1 −6
Original line number Diff line number Diff line
@@ -71,21 +71,16 @@ static int pid_max_max = PID_MAX_LIMIT; 
 * the scheme scales to up to 4 million PIDs, runtime.

 */

struct pid_namespace init_pid_ns = {

	.ns.__ns_ref = REFCOUNT_INIT(2),

	.ns = NS_COMMON_INIT(init_pid_ns, 2),

	.idr = IDR_INIT(init_pid_ns.idr),

	.pid_allocated = PIDNS_ADDING,

	.level = 0,

	.child_reaper = &init_task,

	.user_ns = &init_user_ns,

	.ns.inum = ns_init_inum(&init_pid_ns),

#ifdef CONFIG_PID_NS

	.ns.ops = &pidns_operations,

#endif

	.pid_max = PID_MAX_DEFAULT,

#if defined(CONFIG_SYSCTL) && defined(CONFIG_MEMFD_CREATE)

	.memfd_noexec_scope = MEMFD_NOEXEC_SCOPE_EXEC,

#endif

	.ns.ns_type = ns_common_type(&init_pid_ns),

};

EXPORT_SYMBOL_GPL(init_pid_ns);