iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pid namespaces: rename child_reaper() function

Browse Source 
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>
This commit is contained in:
Sukadev Bhattiprolu 2007-10-18 23:39:50 -07:00 committed by Linus Torvalds
parent 2894d650cd
commit 88f21d8182
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/exec.c
View File

@ -775,7 +775,7 @@ static int de_thread(struct task_struct *tsk)
* Reparenting needs write_lock on tasklist_lock, * Reparenting needs write_lock on tasklist_lock,
* so it is safe to do it under read_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; task_active_pid_ns(tsk)->child_reaper = tsk;
zap_other_threads(tsk); zap_other_threads(tsk);

2
include/linux/pid_namespace.h
View File

@ -44,7 +44,7 @@ static inline struct pid_namespace *task_active_pid_ns(struct task_struct *tsk)
return tsk->nsproxy->pid_ns; 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; return init_pid_ns.child_reaper;
} }

4
kernel/exit.c
View File

@ -674,7 +674,7 @@ forget_original_parent(struct task_struct *father, struct list_head *to_release)
do { do {
reaper = next_thread(reaper); reaper = next_thread(reaper);
if (reaper == father) { if (reaper == father) {
reaper = child_reaper(father); reaper = task_child_reaper(father);
break; break;
} }
} while (reaper->exit_state); } 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) 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; return;
panic("Attempted to kill init!"); panic("Attempted to kill init!");

2
kernel/signal.c
View File

@ -1839,7 +1839,7 @@ relock:
* within that pid space. It can of course get signals from * within that pid space. It can of course get signals from
* its parent pid space. * its parent pid space.
*/ */
if (current == child_reaper(current)) if (current == task_child_reaper(current))
continue; continue;
if (sig_kernel_stop(signr)) { if (sig_kernel_stop(signr)) {