From a7bf04c48924edaa9ad062810146bf2445ed52ca Mon Sep 17 00:00:00 2001
From: Oleg Nesterov <oleg@tv-sign.ru>
Date: Wed, 6 Feb 2008 01:36:13 -0800
Subject: [PATCH] --- yaml --- r: 83375 b: refs/heads/master c:
 d9ae90ac4bdce769ddb27c2e24c3351a30c3daf8 h: refs/heads/master i:   83373:
 4f8251f3994dc609af444eb1caacb4339736acf1   83371:
 a1bead954c2163a45c45116fbbb74bb333eee186   83367:
 5d66adb323386ccab49fe2e6744ac6ab57074fc8   83359:
 24887b0bad40832e8e8e3a1ec6d7e5a47ca2b726 v: v3

---
 [refs]                |  2 +-
 trunk/kernel/fork.c   |  2 +-
 trunk/kernel/ptrace.c | 10 ++++------
 trunk/kernel/signal.c |  2 +-
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index b712ddfb800a..5e873f9dc0b2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 06b8e878a9bc9301201cffe186eba99c4185f20a
+refs/heads/master: d9ae90ac4bdce769ddb27c2e24c3351a30c3daf8
diff --git a/trunk/kernel/fork.c b/trunk/kernel/fork.c
index 2b55b74cd999..8adfe5ddb688 100644
--- a/trunk/kernel/fork.c
+++ b/trunk/kernel/fork.c
@@ -1510,7 +1510,7 @@ long do_fork(unsigned long clone_flags,
 		if (!(clone_flags & CLONE_STOPPED))
 			wake_up_new_task(p, clone_flags);
 		else
-			p->state = TASK_STOPPED;
+			__set_task_state(p, TASK_STOPPED);
 
 		if (unlikely (trace)) {
 			current->ptrace_message = nr;
diff --git a/trunk/kernel/ptrace.c b/trunk/kernel/ptrace.c
index b0d4ab4dfd3d..74730e0c1be1 100644
--- a/trunk/kernel/ptrace.c
+++ b/trunk/kernel/ptrace.c
@@ -53,7 +53,7 @@ void ptrace_untrace(struct task_struct *child)
 	spin_lock(&child->sighand->siglock);
 	if (task_is_traced(child)) {
 		if (child->signal->flags & SIGNAL_STOP_STOPPED) {
-			child->state = TASK_STOPPED;
+			__set_task_state(child, TASK_STOPPED);
 		} else {
 			signal_wake_up(child, 1);
 		}
@@ -103,18 +103,16 @@ int ptrace_check_attach(struct task_struct *child, int kill)
 	    && child->signal != NULL) {
 		ret = 0;
 		spin_lock_irq(&child->sighand->siglock);
-		if (task_is_stopped(child)) {
+		if (task_is_stopped(child))
 			child->state = TASK_TRACED;
-		} else if (!task_is_traced(child) && !kill) {
+		else if (!task_is_traced(child) && !kill)
 			ret = -ESRCH;
-		}
 		spin_unlock_irq(&child->sighand->siglock);
 	}
 	read_unlock(&tasklist_lock);
 
-	if (!ret && !kill) {
+	if (!ret && !kill)
 		wait_task_inactive(child);
-	}
 
 	/* All systems go.. */
 	return ret;
diff --git a/trunk/kernel/signal.c b/trunk/kernel/signal.c
index 6a5f97cd337a..e46971560fcb 100644
--- a/trunk/kernel/signal.c
+++ b/trunk/kernel/signal.c
@@ -1601,7 +1601,7 @@ static void ptrace_stop(int exit_code, int nostop_code, siginfo_t *info)
 	current->exit_code = exit_code;
 
 	/* Let the debugger run.  */
-	set_current_state(TASK_TRACED);
+	__set_current_state(TASK_TRACED);
 	spin_unlock_irq(&current->sighand->siglock);
 	try_to_freeze();
 	read_lock(&tasklist_lock);