aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOleg Nesterov <oleg@tv-sign.ru>2008-08-30 13:08:40 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-09-02 13:49:51 -0400
commitcbaed698f37494b30b2449b51c728ae48630cb2b (patch)
tree470908bdfe0a5f6e5321c0e1010e80ebced701a4
parent6781f4ae30bbb8ebf31187b3c9304be16966f5a0 (diff)
softlockup: minor cleanup, don't check task->state twice
The recent commit 16d9679f33caf7e683471647d1472bfe133d858 changed check_hung_task() to filter out the TASK_KILLABLE tasks. We can move this check to the caller which has to test t->state anyway. Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru> Acked-by: Andi Kleen <ak@linux.intel.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--kernel/softlockup.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/kernel/softlockup.c b/kernel/softlockup.c
index 1a07f8ca4b92..cb838ee93a82 100644
--- a/kernel/softlockup.c
+++ b/kernel/softlockup.c
@@ -180,10 +180,6 @@ static void check_hung_task(struct task_struct *t, unsigned long now)
180 if (t->flags & PF_FROZEN) 180 if (t->flags & PF_FROZEN)
181 return; 181 return;
182 182
183 /* Don't check for tasks waiting on network file systems like NFS */
184 if (t->state & TASK_KILLABLE)
185 return;
186
187 if (switch_count != t->last_switch_count || !t->last_switch_timestamp) { 183 if (switch_count != t->last_switch_count || !t->last_switch_timestamp) {
188 t->last_switch_count = switch_count; 184 t->last_switch_count = switch_count;
189 t->last_switch_timestamp = now; 185 t->last_switch_timestamp = now;
@@ -237,7 +233,8 @@ static void check_hung_uninterruptible_tasks(int this_cpu)
237 do_each_thread(g, t) { 233 do_each_thread(g, t) {
238 if (!--max_count) 234 if (!--max_count)
239 goto unlock; 235 goto unlock;
240 if (t->state & TASK_UNINTERRUPTIBLE) 236 /* use "==" to skip the TASK_KILLABLE tasks waiting on NFS */
237 if (t->state == TASK_UNINTERRUPTIBLE)
241 check_hung_task(t, now); 238 check_hung_task(t, now);
242 } while_each_thread(g, t); 239 } while_each_thread(g, t);
243 unlock: 240 unlock: