aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/linux/sched.h24
-rw-r--r--kernel/pid.c24
2 files changed, 28 insertions, 20 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h
index eb2ae68804aa..cbd8731a66e6 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -1243,11 +1243,7 @@ static inline pid_t task_pid_nr(struct task_struct *tsk)
1243 return tsk->pid; 1243 return tsk->pid;
1244} 1244}
1245 1245
1246static inline pid_t task_pid_nr_ns(struct task_struct *tsk, 1246pid_t task_pid_nr_ns(struct task_struct *tsk, struct pid_namespace *ns);
1247 struct pid_namespace *ns)
1248{
1249 return pid_nr_ns(task_pid(tsk), ns);
1250}
1251 1247
1252static inline pid_t task_pid_vnr(struct task_struct *tsk) 1248static inline pid_t task_pid_vnr(struct task_struct *tsk)
1253{ 1249{
@@ -1260,11 +1256,7 @@ static inline pid_t task_tgid_nr(struct task_struct *tsk)
1260 return tsk->tgid; 1256 return tsk->tgid;
1261} 1257}
1262 1258
1263static inline pid_t task_tgid_nr_ns(struct task_struct *tsk, 1259pid_t task_tgid_nr_ns(struct task_struct *tsk, struct pid_namespace *ns);
1264 struct pid_namespace *ns)
1265{
1266 return pid_nr_ns(task_tgid(tsk), ns);
1267}
1268 1260
1269static inline pid_t task_tgid_vnr(struct task_struct *tsk) 1261static inline pid_t task_tgid_vnr(struct task_struct *tsk)
1270{ 1262{
@@ -1277,11 +1269,7 @@ static inline pid_t task_pgrp_nr(struct task_struct *tsk)
1277 return tsk->signal->pgrp; 1269 return tsk->signal->pgrp;
1278} 1270}
1279 1271
1280static inline pid_t task_pgrp_nr_ns(struct task_struct *tsk, 1272pid_t task_pgrp_nr_ns(struct task_struct *tsk, struct pid_namespace *ns);
1281 struct pid_namespace *ns)
1282{
1283 return pid_nr_ns(task_pgrp(tsk), ns);
1284}
1285 1273
1286static inline pid_t task_pgrp_vnr(struct task_struct *tsk) 1274static inline pid_t task_pgrp_vnr(struct task_struct *tsk)
1287{ 1275{
@@ -1294,11 +1282,7 @@ static inline pid_t task_session_nr(struct task_struct *tsk)
1294 return tsk->signal->__session; 1282 return tsk->signal->__session;
1295} 1283}
1296 1284
1297static inline pid_t task_session_nr_ns(struct task_struct *tsk, 1285pid_t task_session_nr_ns(struct task_struct *tsk, struct pid_namespace *ns);
1298 struct pid_namespace *ns)
1299{
1300 return pid_nr_ns(task_session(tsk), ns);
1301}
1302 1286
1303static inline pid_t task_session_vnr(struct task_struct *tsk) 1287static inline pid_t task_session_vnr(struct task_struct *tsk)
1304{ 1288{
diff --git a/kernel/pid.c b/kernel/pid.c
index 8040533d1a04..d1db36b94674 100644
--- a/kernel/pid.c
+++ b/kernel/pid.c
@@ -443,6 +443,30 @@ pid_t pid_nr_ns(struct pid *pid, struct pid_namespace *ns)
443 return nr; 443 return nr;
444} 444}
445 445
446pid_t task_pid_nr_ns(struct task_struct *tsk, struct pid_namespace *ns)
447{
448 return pid_nr_ns(task_pid(tsk), ns);
449}
450EXPORT_SYMBOL(task_pid_nr_ns);
451
452pid_t task_tgid_nr_ns(struct task_struct *tsk, struct pid_namespace *ns)
453{
454 return pid_nr_ns(task_tgid(tsk), ns);
455}
456EXPORT_SYMBOL(task_tgid_nr_ns);
457
458pid_t task_pgrp_nr_ns(struct task_struct *tsk, struct pid_namespace *ns)
459{
460 return pid_nr_ns(task_pgrp(tsk), ns);
461}
462EXPORT_SYMBOL(task_pgrp_nr_ns);
463
464pid_t task_session_nr_ns(struct task_struct *tsk, struct pid_namespace *ns)
465{
466 return pid_nr_ns(task_session(tsk), ns);
467}
468EXPORT_SYMBOL(task_session_nr_ns);
469
446/* 470/*
447 * Used by proc to find the first pid that is greater then or equal to nr. 471 * Used by proc to find the first pid that is greater then or equal to nr.
448 * 472 *