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>

diff --git a/fs/exec.c b/fs/exec.c
index 6ffb769ed955cc95d680bcf78961e68285e40b2c..4b5bbb87e4949c6f4251f5e8d195eb6eb19a9161 100644 (file)
--- 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 d10cb5f75c0621d5e41de188005f61f55c7d3ff0..aea13ec31aba29a805b17adb05632bde935f47b9 100644 (file)
--- 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 6e6ec300330f5c09e48177897793bb74e8b096ab..d1eddc753fe3df0db57dc13aa52696de6408eec9 100644 (file)
--- 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 15c6940ab046129e9b96c3e336cdd1165b936a69..0a6d3726cb80bd960f468492723438608b4a0ea1 100644 (file)
--- 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)) {