diff options
Diffstat (limited to 'kernel')
| -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 c69c30d827e5..020dedbdf066 100644 --- a/kernel/pid.c +++ b/kernel/pid.c @@ -527,8 +527,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(rcu_dereference(task->pids[type].pid), ns);  	}  	rcu_read_unlock(); @@ -537,12 +540,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));  | 
