summaryrefslogtreecommitdiff
path: root/kernel/pid.c
diff options
context:
space:
mode:
authorOleg Nesterov <oleg@redhat.com>2020-04-21 12:19:04 +0200
committerEric W. Biederman <ebiederm@xmission.com>2020-04-30 06:40:14 -0500
commit1dd694a1b72f69a3add938f4b5bfb4cf9914b133 (patch)
tree97d731499e4568dca1f10e7b8b5e29e0f94f6d0c /kernel/pid.c
parent06576edd0e802cf72a7edaaa2fba7da7b94efaae (diff)
remove the no longer needed pid_alive() check in __task_pid_nr_ns()
Starting from 2c4704756cab ("pids: Move the pgrp and session pid pointers from task_struct to signal_struct") __task_pid_nr_ns() doesn't dereference task->group_leader, we can remove the pid_alive() check. pid_nr_ns() has to check pid != NULL anyway, pid_alive() just adds the unnecessary confusion. Signed-off-by: Oleg Nesterov <oleg@redhat.com> Reviewed-by: "Eric W. Biederman" <ebiederm@xmission.com> Acked-by: Christian Brauner <christian.brauner@ubuntu.com> Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Diffstat (limited to 'kernel/pid.c')
-rw-r--r--kernel/pid.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel/pid.c b/kernel/pid.c
index 6d5d0a5bda82..f1496b757162 100644
--- a/kernel/pid.c
+++ b/kernel/pid.c
@@ -495,8 +495,7 @@ pid_t __task_pid_nr_ns(struct task_struct *task, enum pid_type type,
rcu_read_lock();
if (!ns)
ns = task_active_pid_ns(current);
- if (likely(pid_alive(task)))
- nr = pid_nr_ns(rcu_dereference(*task_pid_ptr(task, type)), ns);
+ nr = pid_nr_ns(rcu_dereference(*task_pid_ptr(task, type)), ns);
rcu_read_unlock();
return nr;