aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOleg Nesterov <oleg@tv-sign.ru>2006-03-28 16:11:06 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-03-28 18:36:41 -0800
commitc97d98931ac52ef110b62d9b75c6a6f2bfbc1898 (patch)
treef811f8b2862692c2eb7ee92e62e8f0afcfd37a2d
parent9b678ece42893b53aae5ed7cb8d7cb261cacb72c (diff)
downloadkernel_samsung_tuna-c97d98931ac52ef110b62d9b75c6a6f2bfbc1898.zip
kernel_samsung_tuna-c97d98931ac52ef110b62d9b75c6a6f2bfbc1898.tar.gz
kernel_samsung_tuna-c97d98931ac52ef110b62d9b75c6a6f2bfbc1898.tar.bz2
[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>
-rw-r--r--include/linux/sched.h12
-rw-r--r--kernel/exit.c4
-rw-r--r--kernel/fork.c4
3 files changed, 6 insertions, 14 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h
index b4b14c3..1f16fb1 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -1186,18 +1186,6 @@ extern void wait_task_inactive(task_t * p);
#define remove_parent(p) list_del_init(&(p)->sibling)
#define add_parent(p) list_add_tail(&(p)->sibling,&(p)->parent->children)
-#define REMOVE_LINKS(p) do { \
- if (thread_group_leader(p)) \
- list_del_init(&(p)->tasks); \
- remove_parent(p); \
- } while (0)
-
-#define SET_LINKS(p) do { \
- if (thread_group_leader(p)) \
- list_add_tail(&(p)->tasks,&init_task.tasks); \
- add_parent(p); \
- } while (0)
-
#define next_task(p) list_entry((p)->tasks.next, struct task_struct, tasks)
#define prev_task(p) list_entry((p)->tasks.prev, struct task_struct, tasks)
diff --git a/kernel/exit.c b/kernel/exit.c
index 5b5e8b6..f436a6b 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -54,11 +54,13 @@ static void __unhash_process(struct task_struct *p)
if (thread_group_leader(p)) {
detach_pid(p, PIDTYPE_PGID);
detach_pid(p, PIDTYPE_SID);
+
+ list_del_init(&p->tasks);
if (p->pid)
__get_cpu_var(process_counts)--;
}
- REMOVE_LINKS(p);
+ remove_parent(p);
}
void release_task(struct task_struct * p)
diff --git a/kernel/fork.c b/kernel/fork.c
index c49bd19..74c6762 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -1181,7 +1181,7 @@ static task_t *copy_process(unsigned long clone_flags,
*/
p->ioprio = current->ioprio;
- SET_LINKS(p);
+ add_parent(p);
if (unlikely(p->ptrace & PT_PTRACED))
__ptrace_link(p, current->parent);
@@ -1191,6 +1191,8 @@ static task_t *copy_process(unsigned long clone_flags,
p->signal->session = current->signal->session;
attach_pid(p, PIDTYPE_PGID, process_group(p));
attach_pid(p, PIDTYPE_SID, p->signal->session);
+
+ list_add_tail(&p->tasks, &init_task.tasks);
if (p->pid)
__get_cpu_var(process_counts)++;
}