Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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>
+7
-36
+1
-4
fs/namespace.c
+1
-4
fs/namespace.c
···
5985
5985
}
5986
5986
5987
5987
struct mnt_namespace init_mnt_ns = {
5988
-
.ns.inum = ns_init_inum(&init_mnt_ns),
5989
-
.ns.ops = &mntns_operations,
5988
+
.ns = NS_COMMON_INIT(init_mnt_ns, 1),
5990
5989
.user_ns = &init_user_ns,
5991
-
.ns.__ns_ref = REFCOUNT_INIT(1),
5992
-
.ns.ns_type = ns_common_type(&init_mnt_ns),
5993
5990
.passive = REFCOUNT_INIT(1),
5994
5991
.mounts = RB_ROOT,
5995
5992
.poll = __WAIT_QUEUE_HEAD_INITIALIZER(init_mnt_ns.poll),
+1
-6
init/version-timestamp.c
+1
-6
init/version-timestamp.c
···
8
8
#include <linux/utsname.h>
9
9
10
10
struct uts_namespace init_uts_ns = {
11
-
.ns.ns_type = ns_common_type(&init_uts_ns),
12
-
.ns.__ns_ref = REFCOUNT_INIT(2),
11
+
.ns = NS_COMMON_INIT(init_uts_ns, 2),
13
12
.name = {
14
13
.sysname = UTS_SYSNAME,
15
14
.nodename = UTS_NODENAME,
···
18
19
.domainname = UTS_DOMAINNAME,
19
20
},
20
21
.user_ns = &init_user_ns,
21
-
.ns.inum = ns_init_inum(&init_uts_ns),
22
-
#ifdef CONFIG_UTS_NS
23
-
.ns.ops = &utsns_operations,
24
-
#endif
25
22
};
26
23
27
24
/* FIXED STRINGS! Don't touch! */
+1
-6
ipc/msgutil.c
+1
-6
ipc/msgutil.c
···
27
27
* and not CONFIG_IPC_NS.
28
28
*/
29
29
struct ipc_namespace init_ipc_ns = {
30
-
.ns.__ns_ref = REFCOUNT_INIT(1),
30
+
.ns = NS_COMMON_INIT(init_ipc_ns, 1),
31
31
.user_ns = &init_user_ns,
32
-
.ns.inum = ns_init_inum(&init_ipc_ns),
33
-
#ifdef CONFIG_IPC_NS
34
-
.ns.ops = &ipcns_operations,
35
-
#endif
36
-
.ns.ns_type = ns_common_type(&init_ipc_ns),
37
32
};
38
33
39
34
struct msg_msgseg {
+1
-4
kernel/cgroup/cgroup.c
+1
-4
kernel/cgroup/cgroup.c
···
250
250
251
251
/* cgroup namespace for init task */
252
252
struct cgroup_namespace init_cgroup_ns = {
253
-
.ns.__ns_ref = REFCOUNT_INIT(2),
253
+
.ns = NS_COMMON_INIT(init_cgroup_ns, 2),
254
254
.user_ns = &init_user_ns,
255
-
.ns.ops = &cgroupns_operations,
256
-
.ns.inum = ns_init_inum(&init_cgroup_ns),
257
255
.root_cset = &init_css_set,
258
-
.ns.ns_type = ns_common_type(&init_cgroup_ns),
259
256
};
260
257
261
258
static struct file_system_type cgroup2_fs_type;
+1
-6
kernel/pid.c
+1
-6
kernel/pid.c
···
71
71
* the scheme scales to up to 4 million PIDs, runtime.
72
72
*/
73
73
struct pid_namespace init_pid_ns = {
74
-
.ns.__ns_ref = REFCOUNT_INIT(2),
74
+
.ns = NS_COMMON_INIT(init_pid_ns, 2),
75
75
.idr = IDR_INIT(init_pid_ns.idr),
76
76
.pid_allocated = PIDNS_ADDING,
77
77
.level = 0,
78
78
.child_reaper = &init_task,
79
79
.user_ns = &init_user_ns,
80
-
.ns.inum = ns_init_inum(&init_pid_ns),
81
-
#ifdef CONFIG_PID_NS
82
-
.ns.ops = &pidns_operations,
83
-
#endif
84
80
.pid_max = PID_MAX_DEFAULT,
85
81
#if defined(CONFIG_SYSCTL) && defined(CONFIG_MEMFD_CREATE)
86
82
.memfd_noexec_scope = MEMFD_NOEXEC_SCOPE_EXEC,
87
83
#endif
88
-
.ns.ns_type = ns_common_type(&init_pid_ns),
89
84
};
90
85
EXPORT_SYMBOL_GPL(init_pid_ns);
91
86
+1
-4
kernel/time/namespace.c
+1
-4
kernel/time/namespace.c
···
478
478
};
479
479
480
480
struct time_namespace init_time_ns = {
481
-
.ns.ns_type = ns_common_type(&init_time_ns),
482
-
.ns.__ns_ref = REFCOUNT_INIT(3),
481
+
.ns = NS_COMMON_INIT(init_time_ns, 3),
483
482
.user_ns = &init_user_ns,
484
-
.ns.inum = ns_init_inum(&init_time_ns),
485
-
.ns.ops = &timens_operations,
486
483
.frozen_offsets = true,
487
484
};
488
485
+1
-6
kernel/user.c
+1
-6
kernel/user.c
···
35
35
* and 1 for... ?
36
36
*/
37
37
struct user_namespace init_user_ns = {
38
+
.ns = NS_COMMON_INIT(init_user_ns, 3),
38
39
.uid_map = {
39
40
{
40
41
.extent[0] = {
···
66
65
.nr_extents = 1,
67
66
},
68
67
},
69
-
.ns.ns_type = ns_common_type(&init_user_ns),
70
-
.ns.__ns_ref = REFCOUNT_INIT(3),
71
68
.owner = GLOBAL_ROOT_UID,
72
69
.group = GLOBAL_ROOT_GID,
73
-
.ns.inum = ns_init_inum(&init_user_ns),
74
-
#ifdef CONFIG_USER_NS
75
-
.ns.ops = &userns_operations,
76
-
#endif
77
70
.flags = USERNS_INIT_FLAGS,
78
71
#ifdef CONFIG_KEYS
79
72
.keyring_name_list = LIST_HEAD_INIT(init_user_ns.keyring_name_list),