diff options
| author | doc HD <doc.divxm@gmail.com> | 2017-11-08 14:23:46 +0300 |
|---|---|---|
| committer | doc HD <doc.divxm@gmail.com> | 2017-11-08 14:23:46 +0300 |
| commit | 9a424a2b73e20d72ef2f4288acd258161eed7d7f (patch) | |
| tree | 91dd024c464b70341e7d01fae0ab895c8e2f639a /kernel/pid.c | |
| parent | 13722774074953eaf8594f4666443cee490b8d73 (diff) | |
| parent | 79df07b459c8364def0f57d711b05ca0d5d822b4 (diff) | |
Merge tag 'android-8.0.0_r0.26' into o8.0o8.0
Android 8.0.0 Release 0.26
Diffstat (limited to 'kernel/pid.c')
| -rw-r--r-- | kernel/pid.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/kernel/pid.c b/kernel/pid.c index 43f22f451bd..054389f18fb 100644 --- a/kernel/pid.c +++ b/kernel/pid.c @@ -522,8 +522,11 @@ pid_t __task_pid_nr_ns(struct task_struct *task, enum pid_type type, if (!ns) ns = task_active_pid_ns(current); if (likely(pid_alive(task))) { - if (type != PIDTYPE_PID) + if (type != PIDTYPE_PID) { + if (type == __PIDTYPE_TGID) + type = PIDTYPE_PID; task = task->group_leader; + } nr = pid_nr_ns(task->pids[type].pid, ns); } rcu_read_unlock(); @@ -532,12 +535,6 @@ pid_t __task_pid_nr_ns(struct task_struct *task, enum pid_type type, } EXPORT_SYMBOL(__task_pid_nr_ns); -pid_t task_tgid_nr_ns(struct task_struct *tsk, struct pid_namespace *ns) -{ - return pid_nr_ns(task_tgid(tsk), ns); -} -EXPORT_SYMBOL(task_tgid_nr_ns); - struct pid_namespace *task_active_pid_ns(struct task_struct *tsk) { return ns_of_pid(task_pid(tsk)); |