From ebcc921e4a1e94b101a3c6fb765a0de9a06a93cd Mon Sep 17 00:00:00 2001 From: Oleg Nesterov Date: Sat, 28 Oct 2006 10:38:49 -0700 Subject: [PATCH] --- yaml --- r: 40409 b: refs/heads/master c: fca178c0c6e8d52a1875be36b070f30884ebfae9 h: refs/heads/master i: 40407: 898ba72569af265edf27e0f69c09220c80f33f38 v: v3 --- [refs] | 2 +- trunk/kernel/taskstats.c | 15 +++++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 6d82827f5fb7..773aa84bde94 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6e6d9fa6f95e382bb2d5725dda18b9e811418e79 +refs/heads/master: fca178c0c6e8d52a1875be36b070f30884ebfae9 diff --git a/trunk/kernel/taskstats.c b/trunk/kernel/taskstats.c index 5d6a8c54ee85..9aeee511a463 100644 --- a/trunk/kernel/taskstats.c +++ b/trunk/kernel/taskstats.c @@ -237,14 +237,17 @@ static int fill_tgid(pid_t tgid, struct task_struct *tgidtsk, } else get_task_struct(first); - /* Start with stats from dead tasks */ - spin_lock_irqsave(&first->signal->stats_lock, flags); - if (first->signal->stats) - memcpy(stats, first->signal->stats, sizeof(*stats)); - spin_unlock_irqrestore(&first->signal->stats_lock, flags); tsk = first; read_lock(&tasklist_lock); + /* Start with stats from dead tasks */ + if (first->signal) { + spin_lock_irqsave(&first->signal->stats_lock, flags); + if (first->signal->stats) + memcpy(stats, first->signal->stats, sizeof(*stats)); + spin_unlock_irqrestore(&first->signal->stats_lock, flags); + } + do { if (tsk->exit_state == EXIT_ZOMBIE && thread_group_leader(tsk)) continue; @@ -264,7 +267,7 @@ static int fill_tgid(pid_t tgid, struct task_struct *tgidtsk, * Accounting subsytems can also add calls here to modify * fields of taskstats. */ - + put_task_struct(first); return 0; }