kernel/delayacct.c: remove redundant checking in __delayacct_add_tsk()
authorChen Gang <gang.chen@asianux.com>
Tue, 12 Nov 2013 23:08:42 +0000 (15:08 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 13 Nov 2013 03:09:12 +0000 (12:09 +0900)
The wrapper function delayacct_add_tsk() already checked 'tsk->delays',
and __delayacct_add_tsk() has no another direct callers, so can remove the
redundancy checking code.

And the label 'done' is also useless, so remove it, too.

Signed-off-by: Chen Gang <gang.chen@asianux.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
kernel/delayacct.c

index d473988..54996b7 100644 (file)
@@ -108,12 +108,6 @@ int __delayacct_add_tsk(struct taskstats *d, struct task_struct *tsk)
        struct timespec ts;
        cputime_t utime, stime, stimescaled, utimescaled;
 
-       /* Though tsk->delays accessed later, early exit avoids
-        * unnecessary returning of other data
-        */
-       if (!tsk->delays)
-               goto done;
-
        tmp = (s64)d->cpu_run_real_total;
        task_cputime(tsk, &utime, &stime);
        cputime_to_timespec(utime + stime, &ts);
@@ -158,7 +152,6 @@ int __delayacct_add_tsk(struct taskstats *d, struct task_struct *tsk)
        d->freepages_count += tsk->delays->freepages_count;
        spin_unlock_irqrestore(&tsk->delays->lock, flags);
 
-done:
        return 0;
 }