From: Chen Ridong The function should_abort_scan will be called in shrink_node_memcgs to integrate shrink_many and shrink_node_memcgs. Renaming it to lru_gen_should_abort_scan clarifies that it is specific to the generational LRU implementation. Signed-off-by: Chen Ridong --- mm/vmscan.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/mm/vmscan.c b/mm/vmscan.c index bbdcd4fcfd74..e55c7835cab5 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -4690,7 +4690,7 @@ static long get_nr_to_scan(struct lruvec *lruvec, struct scan_control *sc, int s return try_to_inc_max_seq(lruvec, max_seq, swappiness, false) ? -1 : 0; } -static bool should_abort_scan(struct lruvec *lruvec, struct scan_control *sc) +static bool lru_gen_should_abort_scan(struct lruvec *lruvec, struct scan_control *sc) { int i; enum zone_watermarks mark; @@ -4742,7 +4742,7 @@ static bool try_to_shrink_lruvec(struct lruvec *lruvec, struct scan_control *sc) if (scanned >= nr_to_scan) break; - if (should_abort_scan(lruvec, sc)) + if (lru_gen_should_abort_scan(lruvec, sc)) break; cond_resched(); @@ -4809,7 +4809,7 @@ static void shrink_many(struct pglist_data *pgdat, struct scan_control *sc) shrink_one(lruvec, sc); - if (should_abort_scan(lruvec, sc)) { + if (lru_gen_should_abort_scan(lruvec, sc)) { mem_cgroup_iter_break(target_memcg, memcg); break; } @@ -5561,6 +5561,10 @@ static void lru_gen_shrink_node(struct pglist_data *pgdat, struct scan_control * BUILD_BUG(); } +static bool lru_gen_should_abort_scan(struct lruvec *lruvec, struct scan_control *sc) +{ + return false; +} #endif /* CONFIG_LRU_GEN */ static void shrink_lruvec(struct lruvec *lruvec, struct scan_control *sc) -- 2.34.1