sched: Remove redundant code from can_migrate_task()
PATCH 1/1 sched: Remove redundant code from can_migrate_task()
There is no opportunity to return 1 if tsk_cache_hot is true and the expression (env->sd->nr_balance_failed > env->sd->cache_nice_tries) is false. Meanwhile, it's unnecessary to judge whether tsk_cache_hot is true or false after being filtered by previous judgment.
Signed-off-by Zhang Hang <[email protected]>
--- kernel/sched/fair.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-)
kernel/sched/fair.c +2 -5
@@ -3929,11 +3929,8 @@ int can_migrate_task(struct task_struct *p, struct lb_env *env)return 1 ; } -if (tsk_cache_hot) { -schedstat_inc (p, se.statistics.nr_failed_migrations_hot); -return 0 ; - } -return 1 ; +schedstat_inc (p, se.statistics.nr_failed_migrations_hot); +return 0 ; }/*
Signature · 1 line
1.7.8.6
tip-bot for Zhang Hang
merge bot[tip:sched/core] sched: Simplify can_migrate_task()
sched: Simplify can_migrate_task()
Commit-ID: 4e2dcb73aecbde9fe4e3137c9ea35cb6aa6cb286 Gitweb: http://git.kernel.org/tip/4e2dcb73aecbde9fe4e3137c9ea35cb6aa6cb286 Author: Zhang Hang <[email protected]> AuthorDate: Wed, 10 Apr 2013 14:04:55 +0800 Committer: Ingo Molnar <[email protected]> CommitDate: Wed, 10 Apr 2013 11:15:45 +0200
sched: Simplify can_migrate_task()
At this point tsk_cache_hot is always true, so no need to check it.
Signed-off-by Zhang Hang <[email protected]>
Cc Peter Zijlstra <[email protected]>
[ Also remove unnecessary schedstat #ifdefs. ]
Signed-off-by Ingo Molnar <[email protected]>
--- kernel/sched/fair.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)
kernel/sched/fair.c +4 -7
@@ -3921,20 +3921,17 @@ int can_migrate_task(struct task_struct *p, struct lb_env *env) tsk_cache_hot =task_hot (p, env->src_rq->clock_task, env->sd);if (!tsk_cache_hot || env->sd->nr_balance_failed > env->sd->cache_nice_tries) { -#ifdef CONFIG_SCHEDSTATS +if (tsk_cache_hot) {schedstat_inc (env->sd, lb_hot_gained[env->idle]);schedstat_inc (p, se.statistics.nr_forced_migrations); } -#endif +return 1 ; } -if (tsk_cache_hot) { -schedstat_inc (p, se.statistics.nr_failed_migrations_hot); -return 0 ; - } -return 1 ; +schedstat_inc (p, se.statistics.nr_failed_migrations_hot); +return 0 ; }/*