diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2025-09-29 10:02:35 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-09-29 10:02:35 -0700 |
| commit | e571372101522fa91735dac6d30a160b2abe600c (patch) | |
| tree | 146cc6b5f1a65f974459e88e77b76ad61183e9bc /fs/proc/array.c | |
| parent | 029a4eb589129450f2735df825f784dd7e8c4c63 (diff) | |
| parent | da664c6db895f70c2be8c3dd371c273b6f8b920f (diff) | |
| download | linux-e571372101522fa91735dac6d30a160b2abe600c.tar.gz linux-e571372101522fa91735dac6d30a160b2abe600c.tar.bz2 linux-e571372101522fa91735dac6d30a160b2abe600c.zip | |
Merge tag 'vfs-6.18-rc1.pidfs' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs
Pull pidfs updates from Christian Brauner:
"This just contains a few changes to pid_nr_ns() to make it more robust
and cleans up or improves a few users that ab- or misuse it currently"
* tag 'vfs-6.18-rc1.pidfs' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs:
pid: change task_state() to use task_ppid_nr_ns()
pid: change bacct_add_tsk() to use task_ppid_nr_ns()
pid: make __task_pid_nr_ns(ns => NULL) safe for zombie callers
pid: Add a judgment for ns null in pid_nr_ns
Diffstat (limited to 'fs/proc/array.c')
| -rw-r--r-- | fs/proc/array.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/proc/array.c b/fs/proc/array.c index d6a0369caa93..69269745d73b 100644 --- a/fs/proc/array.c +++ b/fs/proc/array.c @@ -157,13 +157,11 @@ static inline void task_state(struct seq_file *m, struct pid_namespace *ns, unsigned int max_fds = 0; rcu_read_lock(); - ppid = pid_alive(p) ? - task_tgid_nr_ns(rcu_dereference(p->real_parent), ns) : 0; - tracer = ptrace_parent(p); if (tracer) tpid = task_pid_nr_ns(tracer, ns); + ppid = task_ppid_nr_ns(p, ns); tgid = task_tgid_nr_ns(p, ns); ngid = task_numa_group_id(p); cred = get_task_cred(p); |