diff options
author | Pavel Emelyanov <xemul@openvz.org> | 2007-10-19 02:40:09 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-19 14:53:39 -0400 |
commit | b461cc03828c743aed6b3855b9ab0d39a9d54ec5 (patch) | |
tree | b39ff42df1564adf800d9c4a01ba78ed14f8f9a2 /include/linux/sched.h | |
parent | 07543f5c75cee744b791cf7716c69571486fe753 (diff) |
pid namespaces: miscellaneous preparations for pid namespaces
* remove pid.h from pid_namespaces.h;
* rework is_(cgroup|global)_init;
* optimize (get|put)_pid_ns for init_pid_ns;
* declare task_child_reaper to return actual reaper.
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Cc: Oleg Nesterov <oleg@tv-sign.ru>
Cc: Sukadev Bhattiprolu <sukadev@us.ibm.com>
Cc: Paul Menage <menage@google.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux/sched.h')
-rw-r--r-- | include/linux/sched.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index 511cc4549f58..b0bf326143a9 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h | |||
@@ -1329,19 +1329,17 @@ static inline int pid_alive(struct task_struct *p) | |||
1329 | * @tsk: Task structure to be checked. | 1329 | * @tsk: Task structure to be checked. |
1330 | * | 1330 | * |
1331 | * Check if a task structure is the first user space task the kernel created. | 1331 | * Check if a task structure is the first user space task the kernel created. |
1332 | * | ||
1333 | * TODO: We should inline this function after some cleanups in pid_namespace.h | ||
1334 | */ | 1332 | */ |
1335 | extern int is_global_init(struct task_struct *tsk); | 1333 | static inline int is_global_init(struct task_struct *tsk) |
1334 | { | ||
1335 | return tsk->pid == 1; | ||
1336 | } | ||
1336 | 1337 | ||
1337 | /* | 1338 | /* |
1338 | * is_container_init: | 1339 | * is_container_init: |
1339 | * check whether in the task is init in its own pid namespace. | 1340 | * check whether in the task is init in its own pid namespace. |
1340 | */ | 1341 | */ |
1341 | static inline int is_container_init(struct task_struct *tsk) | 1342 | extern int is_container_init(struct task_struct *tsk); |
1342 | { | ||
1343 | return tsk->pid == 1; | ||
1344 | } | ||
1345 | 1343 | ||
1346 | extern struct pid *cad_pid; | 1344 | extern struct pid *cad_pid; |
1347 | 1345 | ||