aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Brauner <brauner@kernel.org>2025-11-10 16:08:27 +0100
committerChristian Brauner <brauner@kernel.org>2025-11-11 10:01:32 +0100
commit282879afa01936954a570e15b4088a89b6e1b549 (patch)
treee732561b9729da7f906f4f8040448c12b321475a
parent7118daabb65585163fd70eb782f1fbbdb64968a6 (diff)
downloadnet-282879afa01936954a570e15b4088a89b6e1b549.tar.gz
pid: rely on common reference count behavior
Now that we changed the generic reference counting mechanism for all namespaces to never manipulate reference counts of initial namespaces we can drop the special handling for pid namespaces. Link: https://patch.msgid.link/20251110-work-namespace-nstree-fixes-v1-15-e8a9264e0fb9@kernel.org Signed-off-by: Christian Brauner <brauner@kernel.org>
-rw-r--r--include/linux/pid_namespace.h3
-rw-r--r--kernel/pid_namespace.c2
2 files changed, 2 insertions, 3 deletions
diff --git a/include/linux/pid_namespace.h b/include/linux/pid_namespace.h
index 445517a72ad060..0e7ae12c96d2ae 100644
--- a/include/linux/pid_namespace.h
+++ b/include/linux/pid_namespace.h
@@ -61,8 +61,7 @@ static inline struct pid_namespace *to_pid_ns(struct ns_common *ns)
static inline struct pid_namespace *get_pid_ns(struct pid_namespace *ns)
{
- if (ns != &init_pid_ns)
- ns_ref_inc(ns);
+ ns_ref_inc(ns);
return ns;
}
diff --git a/kernel/pid_namespace.c b/kernel/pid_namespace.c
index 650be58d8d1864..e48f5de4136138 100644
--- a/kernel/pid_namespace.c
+++ b/kernel/pid_namespace.c
@@ -184,7 +184,7 @@ struct pid_namespace *copy_pid_ns(u64 flags,
void put_pid_ns(struct pid_namespace *ns)
{
- if (ns && ns != &init_pid_ns && ns_ref_put(ns))
+ if (ns && ns_ref_put(ns))
schedule_work(&ns->work);
}
EXPORT_SYMBOL_GPL(put_pid_ns);