Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 71464
b: refs/heads/master
c: 2f2a3a4
h: refs/heads/master
v: v3
  • Loading branch information
Pavel Emelyanov authored and Linus Torvalds committed Oct 19, 2007
1 parent 8a67157 commit 42537a2
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 21 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 8990571eb573032c1192440febb17132074c5575
refs/heads/master: 2f2a3a46fcafa7a12d61454f67f932dfe7d84c60
24 changes: 4 additions & 20 deletions trunk/include/linux/sched.h
Original file line number Diff line number Diff line change
Expand Up @@ -1243,11 +1243,7 @@ static inline pid_t task_pid_nr(struct task_struct *tsk)
return tsk->pid;
}

static inline pid_t task_pid_nr_ns(struct task_struct *tsk,
struct pid_namespace *ns)
{
return pid_nr_ns(task_pid(tsk), ns);
}
pid_t task_pid_nr_ns(struct task_struct *tsk, struct pid_namespace *ns);

static inline pid_t task_pid_vnr(struct task_struct *tsk)
{
Expand All @@ -1260,11 +1256,7 @@ static inline pid_t task_tgid_nr(struct task_struct *tsk)
return tsk->tgid;
}

static inline pid_t task_tgid_nr_ns(struct task_struct *tsk,
struct pid_namespace *ns)
{
return pid_nr_ns(task_tgid(tsk), ns);
}
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)
{
Expand All @@ -1277,11 +1269,7 @@ static inline pid_t task_pgrp_nr(struct task_struct *tsk)
return tsk->signal->pgrp;
}

static inline pid_t task_pgrp_nr_ns(struct task_struct *tsk,
struct pid_namespace *ns)
{
return pid_nr_ns(task_pgrp(tsk), ns);
}
pid_t task_pgrp_nr_ns(struct task_struct *tsk, struct pid_namespace *ns);

static inline pid_t task_pgrp_vnr(struct task_struct *tsk)
{
Expand All @@ -1294,11 +1282,7 @@ static inline pid_t task_session_nr(struct task_struct *tsk)
return tsk->signal->__session;
}

static inline pid_t task_session_nr_ns(struct task_struct *tsk,
struct pid_namespace *ns)
{
return pid_nr_ns(task_session(tsk), ns);
}
pid_t task_session_nr_ns(struct task_struct *tsk, struct pid_namespace *ns);

static inline pid_t task_session_vnr(struct task_struct *tsk)
{
Expand Down
24 changes: 24 additions & 0 deletions trunk/kernel/pid.c
Original file line number Diff line number Diff line change
Expand Up @@ -443,6 +443,30 @@ pid_t pid_nr_ns(struct pid *pid, struct pid_namespace *ns)
return nr;
}

pid_t task_pid_nr_ns(struct task_struct *tsk, struct pid_namespace *ns)
{
return pid_nr_ns(task_pid(tsk), ns);
}
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);

pid_t task_pgrp_nr_ns(struct task_struct *tsk, struct pid_namespace *ns)
{
return pid_nr_ns(task_pgrp(tsk), ns);
}
EXPORT_SYMBOL(task_pgrp_nr_ns);

pid_t task_session_nr_ns(struct task_struct *tsk, struct pid_namespace *ns)
{
return pid_nr_ns(task_session(tsk), ns);
}
EXPORT_SYMBOL(task_session_nr_ns);

/*
* Used by proc to find the first pid that is greater then or equal to nr.
*
Expand Down

0 comments on commit 42537a2

Please sign in to comment.