From: Chen Ridong Since shrink_node_memcgs already handles the memcg disabled case, this special-case logic in lru_gen_shrink_node is unnecessary. Remove it. Signed-off-by: Chen Ridong --- mm/vmscan.c | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/mm/vmscan.c b/mm/vmscan.c index 1d13ce7338b4..5ea98bb94156 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -4759,24 +4759,6 @@ static bool try_to_shrink_lruvec(struct lruvec *lruvec, struct scan_control *sc) return nr_to_scan < 0; } -static void shrink_one(struct lruvec *lruvec, struct scan_control *sc) -{ - unsigned long scanned = sc->nr_scanned; - unsigned long reclaimed = sc->nr_reclaimed; - struct pglist_data *pgdat = lruvec_pgdat(lruvec); - struct mem_cgroup *memcg = lruvec_memcg(lruvec); - - try_to_shrink_lruvec(lruvec, sc); - - shrink_slab(sc->gfp_mask, pgdat->node_id, memcg, sc->priority); - - if (!sc->proactive) - vmpressure(sc->gfp_mask, memcg, false, sc->nr_scanned - scanned, - sc->nr_reclaimed - reclaimed); - - flush_reclaim_state(sc); -} - static void lru_gen_shrink_lruvec(struct lruvec *lruvec, struct scan_control *sc) { struct blk_plug plug; @@ -4832,10 +4814,7 @@ static void lru_gen_shrink_node(struct pglist_data *pgdat, struct scan_control * if (current_is_kswapd()) sc->nr_reclaimed = 0; - if (mem_cgroup_disabled()) - shrink_one(&pgdat->__lruvec, sc); - else - shrink_node_memcgs(pgdat, sc); + shrink_node_memcgs(pgdat, sc); if (current_is_kswapd()) sc->nr_reclaimed += reclaimed; -- 2.34.1