diff options
Diffstat (limited to 'include/linux/sched.h')
| -rw-r--r-- | include/linux/sched.h | 51 | 
1 files changed, 27 insertions, 24 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index 8337e2db0bb2..c05ac5f5aa03 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -1163,13 +1163,6 @@ static inline pid_t task_tgid_nr(struct task_struct *tsk)  	return tsk->tgid;  } -extern pid_t task_tgid_nr_ns(struct task_struct *tsk, struct pid_namespace *ns); - -static inline pid_t task_tgid_vnr(struct task_struct *tsk) -{ -	return pid_vnr(task_tgid(tsk)); -} -  /**   * pid_alive - check that a task structure is not stale   * @p: Task structure to be checked. @@ -1185,23 +1178,6 @@ static inline int pid_alive(const struct task_struct *p)  	return p->pids[PIDTYPE_PID].pid != NULL;  } -static inline pid_t task_ppid_nr_ns(const struct task_struct *tsk, struct pid_namespace *ns) -{ -	pid_t pid = 0; - -	rcu_read_lock(); -	if (pid_alive(tsk)) -		pid = task_tgid_nr_ns(rcu_dereference(tsk->real_parent), ns); -	rcu_read_unlock(); - -	return pid; -} - -static inline pid_t task_ppid_nr(const struct task_struct *tsk) -{ -	return task_ppid_nr_ns(tsk, &init_pid_ns); -} -  static inline pid_t task_pgrp_nr_ns(struct task_struct *tsk, struct pid_namespace *ns)  {  	return __task_pid_nr_ns(tsk, PIDTYPE_PGID, ns); @@ -1223,6 +1199,33 @@ static inline pid_t task_session_vnr(struct task_struct *tsk)  	return __task_pid_nr_ns(tsk, PIDTYPE_SID, NULL);  } +static inline pid_t task_tgid_nr_ns(struct task_struct *tsk, struct pid_namespace *ns) +{ +	return __task_pid_nr_ns(tsk, __PIDTYPE_TGID, ns); +} + +static inline pid_t task_tgid_vnr(struct task_struct *tsk) +{ +	return __task_pid_nr_ns(tsk, __PIDTYPE_TGID, NULL); +} + +static inline pid_t task_ppid_nr_ns(const struct task_struct *tsk, struct pid_namespace *ns) +{ +	pid_t pid = 0; + +	rcu_read_lock(); +	if (pid_alive(tsk)) +		pid = task_tgid_nr_ns(rcu_dereference(tsk->real_parent), ns); +	rcu_read_unlock(); + +	return pid; +} + +static inline pid_t task_ppid_nr(const struct task_struct *tsk) +{ +	return task_ppid_nr_ns(tsk, &init_pid_ns); +} +  /* Obsolete, do not use: */  static inline pid_t task_pgrp_nr(struct task_struct *tsk)  {  |