From 63ef005d04e9c4dd19aeef9a36fc2d887f1a2313 Mon Sep 17 00:00:00 2001 From: Shailabh Nagar Date: Sun, 30 Jul 2006 03:03:10 -0700 Subject: [PATCH] --- yaml --- r: 32914 b: refs/heads/master c: 7d94dddd438bcba97db44f120da39bb001b5249f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/delayacct.h | 4 +--- trunk/kernel/taskstats.c | 8 +++----- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 6a68d71e9644..0dc96a590afd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 15a647eba94c3da27ccc666bea72e7cca06b2d19 +refs/heads/master: 7d94dddd438bcba97db44f120da39bb001b5249f diff --git a/trunk/include/linux/delayacct.h b/trunk/include/linux/delayacct.h index 7e8b6011b8f3..8a284cc6fd5f 100644 --- a/trunk/include/linux/delayacct.h +++ b/trunk/include/linux/delayacct.h @@ -80,9 +80,7 @@ static inline void delayacct_blkio_end(void) static inline int delayacct_add_tsk(struct taskstats *d, struct task_struct *tsk) { - if (likely(!delayacct_on)) - return -EINVAL; - if (!tsk->delays) + if (likely(!delayacct_on) || !tsk->delays) return 0; return __delayacct_add_tsk(d, tsk); } diff --git a/trunk/kernel/taskstats.c b/trunk/kernel/taskstats.c index f45179ce028e..b4c737a11408 100644 --- a/trunk/kernel/taskstats.c +++ b/trunk/kernel/taskstats.c @@ -177,7 +177,7 @@ static int send_cpu_listeners(struct sk_buff *skb, unsigned int cpu) static int fill_pid(pid_t pid, struct task_struct *pidtsk, struct taskstats *stats) { - int rc; + int rc = 0; struct task_struct *tsk = pidtsk; if (!pidtsk) { @@ -196,12 +196,10 @@ static int fill_pid(pid_t pid, struct task_struct *pidtsk, * Each accounting subsystem adds calls to its functions to * fill in relevant parts of struct taskstsats as follows * - * rc = per-task-foo(stats, tsk); - * if (rc) - * goto err; + * per-task-foo(stats, tsk); */ - rc = delayacct_add_tsk(stats, tsk); + delayacct_add_tsk(stats, tsk); stats->version = TASKSTATS_VERSION; /* Define err: label here if needed */