From: Sukadev Bhattiprolu Date: Fri, 19 Oct 2007 06:39:50 +0000 (-0700) Subject: pid namespaces: rename child_reaper() function X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=88f21d818255bc61c002478d21caf52f8a9b8def;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git 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 Cc: Pavel Emelianov Cc: Eric W. Biederman Cc: Cedric Le Goater Cc: Dave Hansen Cc: Serge Hallyn Cc: Herbert Poetzel Cc: Kirill Korotaev Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/fs/exec.c b/fs/exec.c index 6ffb769ed95..4b5bbb87e49 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 d10cb5f75c0..aea13ec31ab 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 6e6ec300330..d1eddc753fe 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 15c6940ab04..0a6d3726cb8 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)) {