aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorOleg Nesterov <oleg@tv-sign.ru>2008-02-06 04:36:13 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-06 13:41:00 -0500
commitd9ae90ac4bdce769ddb27c2e24c3351a30c3daf8 (patch)
tree220f88576b5c83369892ce13cb180bab6cccba7a /kernel
parent06b8e878a9bc9301201cffe186eba99c4185f20a (diff)
use __set_task_state() for TRACED/STOPPED tasks
1. It is much easier to grep for ->state change if __set_task_state() is used instead of the direct assignment. 2. ptrace_stop() and handle_group_stop() use set_task_state() which adds the unneeded mb() (btw even if we use mb() it is still possible that do_wait() sees the new ->state but not ->exit_code, but this is ok). Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru> Acked-by: Roland McGrath <roland@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/fork.c2
-rw-r--r--kernel/ptrace.c10
-rw-r--r--kernel/signal.c2
3 files changed, 6 insertions, 8 deletions
diff --git a/kernel/fork.c b/kernel/fork.c
index 2b55b74cd999..8adfe5ddb688 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -1510,7 +1510,7 @@ long do_fork(unsigned long clone_flags,
1510 if (!(clone_flags & CLONE_STOPPED)) 1510 if (!(clone_flags & CLONE_STOPPED))
1511 wake_up_new_task(p, clone_flags); 1511 wake_up_new_task(p, clone_flags);
1512 else 1512 else
1513 p->state = TASK_STOPPED; 1513 __set_task_state(p, TASK_STOPPED);
1514 1514
1515 if (unlikely (trace)) { 1515 if (unlikely (trace)) {
1516 current->ptrace_message = nr; 1516 current->ptrace_message = nr;
diff --git a/kernel/ptrace.c b/kernel/ptrace.c
index b0d4ab4dfd3d..74730e0c1be1 100644
--- a/kernel/ptrace.c
+++ b/kernel/ptrace.c
@@ -53,7 +53,7 @@ void ptrace_untrace(struct task_struct *child)
53 spin_lock(&child->sighand->siglock); 53 spin_lock(&child->sighand->siglock);
54 if (task_is_traced(child)) { 54 if (task_is_traced(child)) {
55 if (child->signal->flags & SIGNAL_STOP_STOPPED) { 55 if (child->signal->flags & SIGNAL_STOP_STOPPED) {
56 child->state = TASK_STOPPED; 56 __set_task_state(child, TASK_STOPPED);
57 } else { 57 } else {
58 signal_wake_up(child, 1); 58 signal_wake_up(child, 1);
59 } 59 }
@@ -103,18 +103,16 @@ int ptrace_check_attach(struct task_struct *child, int kill)
103 && child->signal != NULL) { 103 && child->signal != NULL) {
104 ret = 0; 104 ret = 0;
105 spin_lock_irq(&child->sighand->siglock); 105 spin_lock_irq(&child->sighand->siglock);
106 if (task_is_stopped(child)) { 106 if (task_is_stopped(child))
107 child->state = TASK_TRACED; 107 child->state = TASK_TRACED;
108 } else if (!task_is_traced(child) && !kill) { 108 else if (!task_is_traced(child) && !kill)
109 ret = -ESRCH; 109 ret = -ESRCH;
110 }
111 spin_unlock_irq(&child->sighand->siglock); 110 spin_unlock_irq(&child->sighand->siglock);
112 } 111 }
113 read_unlock(&tasklist_lock); 112 read_unlock(&tasklist_lock);
114 113
115 if (!ret && !kill) { 114 if (!ret && !kill)
116 wait_task_inactive(child); 115 wait_task_inactive(child);
117 }
118 116
119 /* All systems go.. */ 117 /* All systems go.. */
120 return ret; 118 return ret;
diff --git a/kernel/signal.c b/kernel/signal.c
index 6a5f97cd337a..e46971560fcb 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -1601,7 +1601,7 @@ static void ptrace_stop(int exit_code, int nostop_code, siginfo_t *info)
1601 current->exit_code = exit_code; 1601 current->exit_code = exit_code;
1602 1602
1603 /* Let the debugger run. */ 1603 /* Let the debugger run. */
1604 set_current_state(TASK_TRACED); 1604 __set_current_state(TASK_TRACED);
1605 spin_unlock_irq(&current->sighand->siglock); 1605 spin_unlock_irq(&current->sighand->siglock);
1606 try_to_freeze(); 1606 try_to_freeze();
1607 read_lock(&tasklist_lock); 1607 read_lock(&tasklist_lock);