kernel/delayacct.c: remove redundant checking in __delayacct_add_tsk()

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>
This commit is contained in:
Chen Gang 2013-11-12 15:08:42 -08:00 коммит произвёл Linus Torvalds
Родитель c725ee54c3
Коммит 324d666a53
1 изменённых файлов: 0 добавлений и 7 удалений

Просмотреть файл

@ -108,12 +108,6 @@ int __delayacct_add_tsk(struct taskstats *d, struct task_struct *tsk)
struct timespec ts; struct timespec ts;
cputime_t utime, stime, stimescaled, utimescaled; 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; tmp = (s64)d->cpu_run_real_total;
task_cputime(tsk, &utime, &stime); task_cputime(tsk, &utime, &stime);
cputime_to_timespec(utime + stime, &ts); 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; d->freepages_count += tsk->delays->freepages_count;
spin_unlock_irqrestore(&tsk->delays->lock, flags); spin_unlock_irqrestore(&tsk->delays->lock, flags);
done:
return 0; return 0;
} }