superrob1500
/
mirror-linux
mirror of https://github.com/torvalds/linux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ns: drop custom reference count initialization for initial namespaces 

Initial namespaces don't modify their reference count anymore.
They remain fixed at one so drop the custom refcount initializations.

Link: https://patch.msgid.link/20251110-work-namespace-nstree-fixes-v1-16-e8a9264e0fb9@kernel.org
Signed-off-by: Christian Brauner <brauner@kernel.org>
pull/1354/merge
Christian Brauner 2025-11-10 16:08:28 +01:00
parent 282879afa0
commit c2bbd2db52
No known key found for this signature in database
GPG Key ID: 91C61BC06578DCA2
8 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/namespace.c
View File

@ -5986,7 +5986,7 @@ SYSCALL_DEFINE4(listmount, const struct mnt_id_req __user *, req,
} }
struct mnt_namespace init_mnt_ns = { struct mnt_namespace init_mnt_ns = {
.ns = NS_COMMON_INIT(init_mnt_ns, 1), .ns = NS_COMMON_INIT(init_mnt_ns),
.user_ns = &init_user_ns, .user_ns = &init_user_ns,
.passive = REFCOUNT_INIT(1), .passive = REFCOUNT_INIT(1),
.mounts = RB_ROOT, .mounts = RB_ROOT,

4
include/linux/ns_common.h
View File

@ -26,14 +26,14 @@ static __always_inline bool is_ns_init_id(const struct ns_common *ns)
return ns->ns_id <= NS_LAST_INIT_ID; return ns->ns_id <= NS_LAST_INIT_ID;
} }
#define NS_COMMON_INIT(nsname, refs) \ #define NS_COMMON_INIT(nsname) \
{ \ { \
.ns_type = ns_common_type(&nsname), \ .ns_type = ns_common_type(&nsname), \
.ns_id = ns_init_id(&nsname), \ .ns_id = ns_init_id(&nsname), \
.inum = ns_init_inum(&nsname), \ .inum = ns_init_inum(&nsname), \
.ops = to_ns_operations(&nsname), \ .ops = to_ns_operations(&nsname), \
.stashed = NULL, \ .stashed = NULL, \
.__ns_ref = REFCOUNT_INIT(refs), \ .__ns_ref = REFCOUNT_INIT(1), \
.__ns_ref_active = ATOMIC_INIT(1), \ .__ns_ref_active = ATOMIC_INIT(1), \
.ns_unified_node.ns_list_entry = LIST_HEAD_INIT(nsname.ns.ns_unified_node.ns_list_entry), \ .ns_unified_node.ns_list_entry = LIST_HEAD_INIT(nsname.ns.ns_unified_node.ns_list_entry), \
.ns_tree_node.ns_list_entry = LIST_HEAD_INIT(nsname.ns.ns_tree_node.ns_list_entry), \ .ns_tree_node.ns_list_entry = LIST_HEAD_INIT(nsname.ns.ns_tree_node.ns_list_entry), \

2
init/version-timestamp.c
View File

@ -8,7 +8,7 @@
#include <linux/utsname.h> #include <linux/utsname.h>
struct uts_namespace init_uts_ns = { struct uts_namespace init_uts_ns = {
.ns = NS_COMMON_INIT(init_uts_ns, 2), .ns = NS_COMMON_INIT(init_uts_ns),
.name = { .name = {
.sysname = UTS_SYSNAME, .sysname = UTS_SYSNAME,
.nodename = UTS_NODENAME, .nodename = UTS_NODENAME,

2
ipc/msgutil.c
View File

@ -27,7 +27,7 @@ DEFINE_SPINLOCK(mq_lock);
* and not CONFIG_IPC_NS. * and not CONFIG_IPC_NS.
*/ */
struct ipc_namespace init_ipc_ns = { struct ipc_namespace init_ipc_ns = {
.ns = NS_COMMON_INIT(init_ipc_ns, 1), .ns = NS_COMMON_INIT(init_ipc_ns),
.user_ns = &init_user_ns, .user_ns = &init_user_ns,
}; };

2
kernel/cgroup/cgroup.c
View File

@ -250,7 +250,7 @@ bool cgroup_enable_per_threadgroup_rwsem __read_mostly;
/* cgroup namespace for init task */ /* cgroup namespace for init task */
struct cgroup_namespace init_cgroup_ns = { struct cgroup_namespace init_cgroup_ns = {
.ns = NS_COMMON_INIT(init_cgroup_ns, 2), .ns = NS_COMMON_INIT(init_cgroup_ns),
.user_ns = &init_user_ns, .user_ns = &init_user_ns,
.root_cset = &init_css_set, .root_cset = &init_css_set,
}; };

2
kernel/pid.c
View File

@ -71,7 +71,7 @@ static int pid_max_max = PID_MAX_LIMIT;
* the scheme scales to up to 4 million PIDs, runtime. * the scheme scales to up to 4 million PIDs, runtime.
*/ */
struct pid_namespace init_pid_ns = { struct pid_namespace init_pid_ns = {
.ns = NS_COMMON_INIT(init_pid_ns, 2), .ns = NS_COMMON_INIT(init_pid_ns),
.idr = IDR_INIT(init_pid_ns.idr), .idr = IDR_INIT(init_pid_ns.idr),
.pid_allocated = PIDNS_ADDING, .pid_allocated = PIDNS_ADDING,
.level = 0, .level = 0,

2
kernel/time/namespace.c
View File

@ -478,7 +478,7 @@ const struct proc_ns_operations timens_for_children_operations = {
}; };
struct time_namespace init_time_ns = { struct time_namespace init_time_ns = {
.ns = NS_COMMON_INIT(init_time_ns, 3), .ns = NS_COMMON_INIT(init_time_ns),
.user_ns = &init_user_ns, .user_ns = &init_user_ns,
.frozen_offsets = true, .frozen_offsets = true,
}; };

2
kernel/user.c
View File

@ -35,7 +35,7 @@ EXPORT_SYMBOL_GPL(init_binfmt_misc);
* and 1 for... ? * and 1 for... ?
*/ */
struct user_namespace init_user_ns = { struct user_namespace init_user_ns = {
.ns = NS_COMMON_INIT(init_user_ns, 3), .ns = NS_COMMON_INIT(init_user_ns),
.uid_map = { .uid_map = {
{ {
.extent[0] = { .extent[0] = {