Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 88f21d81 authored by Sukadev Bhattiprolu's avatar Sukadev Bhattiprolu Committed by Linus Torvalds
Browse files

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: default avatarSukadev 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 2894d650

fs/exec.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

include/linux/pid_namespace.h

+1 −1
Original line number Diff line number Diff line
@@ -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;

}

kernel/exit.c

+2 −2
Original line number Diff line number Diff line
@@ -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!");

kernel/signal.c

+1 −1
Original line number Diff line number Diff line
@@ -1839,7 +1839,7 @@ int get_signal_to_deliver(siginfo_t *info, struct k_sigaction *return_ka, 
		 * 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)) {