[PATCH 3/3] sched/fair: Rename cfs_rq_has_blocked() => cfs_rq_has_blocked_load_avg()

[Ingo Molnar]

There's three separate, independent pieces of logic in the
scheduler that are named 'has_blocked':

  1) nohz.has_blocked,
  2) rq->has_blocked_load - both of these relate to NOHZ balancing,

  3) and cfs_rq_has_blocked(), which operates on SMP load-balancing
     averages.

To reduce confusion, split these 3 shared uses of 'has_blocked' name
patterns into 3 distinct and greppable patterns:

  1) nohz.has_blocked related functions and variables use
     'has_blocked',

  2) rq->has_blocked_load related functions and variables use
    'has_blocked_load',

  3) and cfs_rq_has_blocked() uses 'has_blocked_load_avg'.

This patch implements (3) and renames cfs_rq_has_blocked() to
cfs_rq_has_blocked_load_avg().

No change in functionality.

Cc: Shrikanth Hegde <sshegde@xxxxxxxxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx>
---
 kernel/sched/fair.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index a8a67d25873c..c098aedab694 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -9767,7 +9767,7 @@ static void attach_tasks(struct lb_env *env)
 }
 
 #ifdef CONFIG_NO_HZ_COMMON
-static inline bool cfs_rq_has_blocked(struct cfs_rq *cfs_rq)
+static inline bool cfs_rq_has_blocked_load_avg(struct cfs_rq *cfs_rq)
 {
 	if (cfs_rq->avg.load_avg)
 		return true;
@@ -9806,7 +9806,7 @@ static inline void update_blocked_load_status(struct rq *rq, bool has_blocked_lo
 		rq->has_blocked_load = 0;
 }
 #else /* !CONFIG_NO_HZ_COMMON: */
-static inline bool cfs_rq_has_blocked(struct cfs_rq *cfs_rq) { return false; }
+static inline bool cfs_rq_has_blocked_load_avg(struct cfs_rq *cfs_rq) { return false; }
 static inline bool others_have_blocked(struct rq *rq) { return false; }
 static inline void update_blocked_load_tick(struct rq *rq) {}
 static inline void update_blocked_load_status(struct rq *rq, bool has_blocked_load) {}
@@ -9866,7 +9866,7 @@ static bool __update_blocked_fair(struct rq *rq, bool *done)
 			list_del_leaf_cfs_rq(cfs_rq);
 
 		/* Don't need periodic decay once load/util_avg are null */
-		if (cfs_rq_has_blocked(cfs_rq))
+		if (cfs_rq_has_blocked_load_avg(cfs_rq))
 			*done = false;
 	}
 
@@ -9926,7 +9926,7 @@ static bool __update_blocked_fair(struct rq *rq, bool *done)
 	bool decayed;
 
 	decayed = update_cfs_rq_load_avg(cfs_rq_clock_pelt(cfs_rq), cfs_rq);
-	if (cfs_rq_has_blocked(cfs_rq))
+	if (cfs_rq_has_blocked_load_avg(cfs_rq))
 		*done = false;
 
 	return decayed;
-- 
2.51.0