---

yaml --- r: 71428 b: refs/heads/master c: 88f21d8 h: refs/heads/master v: v3
git-mirror · Oct 19, 2007 · 3b531a1 · 3b531a1
1 parent a137649
commit 3b531a1
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2894d650cd9715d00ca196c711265819ef6ebd2d
+refs/heads/master: 88f21d818255bc61c002478d21caf52f8a9b8def
diff --git a/trunk/fs/exec.c b/trunk/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/trunk/include/linux/pid_namespace.h b/trunk/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/trunk/kernel/exit.c b/trunk/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/trunk/kernel/signal.c b/trunk/kernel/signal.c
@@ -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)) {