aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorOleg Nesterov <oleg@tv-sign.ru>2006-03-28 19:11:06 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-03-28 21:36:41 -0500
commitc97d98931ac52ef110b62d9b75c6a6f2bfbc1898 (patch)
treef811f8b2862692c2eb7ee92e62e8f0afcfd37a2d /kernel
parent9b678ece42893b53aae5ed7cb8d7cb261cacb72c (diff)
[PATCH] kill SET_LINKS/REMOVE_LINKS
Both SET_LINKS() and SET_LINKS/REMOVE_LINKS() have exactly one caller, and these callers already check thread_group_leader(). This patch kills theese macros, they mix two different things: setting process's parent and registering it in init_task.tasks list. Callers are updated to do these actions by hand. Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru> Cc: "Eric W. Biederman" <ebiederm@xmission.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/exit.c4
-rw-r--r--kernel/fork.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/kernel/exit.c b/kernel/exit.c
index 5b5e8b67680e..f436a6bd3fb7 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -54,11 +54,13 @@ static void __unhash_process(struct task_struct *p)
54 if (thread_group_leader(p)) { 54 if (thread_group_leader(p)) {
55 detach_pid(p, PIDTYPE_PGID); 55 detach_pid(p, PIDTYPE_PGID);
56 detach_pid(p, PIDTYPE_SID); 56 detach_pid(p, PIDTYPE_SID);
57
58 list_del_init(&p->tasks);
57 if (p->pid) 59 if (p->pid)
58 __get_cpu_var(process_counts)--; 60 __get_cpu_var(process_counts)--;
59 } 61 }
60 62
61 REMOVE_LINKS(p); 63 remove_parent(p);
62} 64}
63 65
64void release_task(struct task_struct * p) 66void release_task(struct task_struct * p)
diff --git a/kernel/fork.c b/kernel/fork.c
index c49bd193b058..74c67629ee62 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -1181,7 +1181,7 @@ static task_t *copy_process(unsigned long clone_flags,
1181 */ 1181 */
1182 p->ioprio = current->ioprio; 1182 p->ioprio = current->ioprio;
1183 1183
1184 SET_LINKS(p); 1184 add_parent(p);
1185 if (unlikely(p->ptrace & PT_PTRACED)) 1185 if (unlikely(p->ptrace & PT_PTRACED))
1186 __ptrace_link(p, current->parent); 1186 __ptrace_link(p, current->parent);
1187 1187
@@ -1191,6 +1191,8 @@ static task_t *copy_process(unsigned long clone_flags,
1191 p->signal->session = current->signal->session; 1191 p->signal->session = current->signal->session;
1192 attach_pid(p, PIDTYPE_PGID, process_group(p)); 1192 attach_pid(p, PIDTYPE_PGID, process_group(p));
1193 attach_pid(p, PIDTYPE_SID, p->signal->session); 1193 attach_pid(p, PIDTYPE_SID, p->signal->session);
1194
1195 list_add_tail(&p->tasks, &init_task.tasks);
1194 if (p->pid) 1196 if (p->pid)
1195 __get_cpu_var(process_counts)++; 1197 __get_cpu_var(process_counts)++;
1196 } 1198 }