diff options
| author | Sukadev Bhattiprolu <sukadev@us.ibm.com> | 2007-10-19 08:39:50 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-19 20:53:37 +0200 |
| commit | 88f21d818255bc61c002478d21caf52f8a9b8def (patch) | |
| tree | de16e38862622b3d295f7850cdb006922307fb8d | |
| parent | pid namespaces: define and use task_active_pid_ns() wrapper (diff) | |
| download | linux-88f21d818255bc61c002478d21caf52f8a9b8def.tar.xz linux-88f21d818255bc61c002478d21caf52f8a9b8def.zip | |
pid namespaces: rename child_reaper() function
Rename the child_reaper() function to task_child_reaper() to be similar to
other task_* functions and to distinguish the function from 'struct
pid_namspace.child_reaper'.
Signed-off-by: Sukadev Bhattiprolu <sukadev@us.ibm.com>
Cc: Pavel Emelianov <xemul@openvz.org>
Cc: Eric W. Biederman <ebiederm@xmission.com>
Cc: Cedric Le Goater <clg@fr.ibm.com>
Cc: Dave Hansen <haveblue@us.ibm.com>
Cc: Serge Hallyn <serue@us.ibm.com>
Cc: Herbert Poetzel <herbert@13thfloor.at>
Cc: Kirill Korotaev <dev@sw.ru>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | fs/exec.c | 2 | ||||
| -rw-r--r-- | include/linux/pid_namespace.h | 2 | ||||
| -rw-r--r-- | kernel/exit.c | 4 | ||||
| -rw-r--r-- | kernel/signal.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/fs/exec.c b/fs/exec.c index 6ffb769ed955..4b5bbb87e494 100644 --- a/fs/exec.c +++ b/fs/exec.c @@ -775,7 +775,7 @@ static int de_thread(struct task_struct *tsk) * Reparenting needs write_lock on tasklist_lock, * so it is safe to do it under read_lock. */ - if (unlikely(tsk->group_leader == child_reaper(tsk))) + if (unlikely(tsk->group_leader == task_child_reaper(tsk))) task_active_pid_ns(tsk)->child_reaper = tsk; zap_other_threads(tsk); diff --git a/include/linux/pid_namespace.h b/include/linux/pid_namespace.h index d10cb5f75c06..aea13ec31aba 100644 --- a/include/linux/pid_namespace.h +++ b/include/linux/pid_namespace.h @@ -44,7 +44,7 @@ static inline struct pid_namespace *task_active_pid_ns(struct task_struct *tsk) return tsk->nsproxy->pid_ns; } -static inline struct task_struct *child_reaper(struct task_struct *tsk) +static inline struct task_struct *task_child_reaper(struct task_struct *tsk) { return init_pid_ns.child_reaper; } diff --git a/kernel/exit.c b/kernel/exit.c index 6e6ec300330f..d1eddc753fe3 100644 --- a/kernel/exit.c +++ b/kernel/exit.c @@ -674,7 +674,7 @@ forget_original_parent(struct task_struct *father, struct list_head *to_release) do { reaper = next_thread(reaper); if (reaper == father) { - reaper = child_reaper(father); + reaper = task_child_reaper(father); break; } } while (reaper->exit_state); @@ -874,7 +874,7 @@ static inline void check_stack_usage(void) {} static inline void exit_child_reaper(struct task_struct *tsk) { - if (likely(tsk->group_leader != child_reaper(tsk))) + if (likely(tsk->group_leader != task_child_reaper(tsk))) return; panic("Attempted to kill init!"); diff --git a/kernel/signal.c b/kernel/signal.c index 15c6940ab046..0a6d3726cb80 100644 --- a/kernel/signal.c +++ b/kernel/signal.c @@ -1839,7 +1839,7 @@ relock: * within that pid space. It can of course get signals from * its parent pid space. */ - if (current == child_reaper(current)) + if (current == task_child_reaper(current)) continue; if (sig_kernel_stop(signr)) { |