From: Shakeel Butt <shakeel.butt@linux.dev>
Date: Sat, 26 Oct 2024 06:34:34 +0000 (-0700)
Subject: memcg-v1-no-need-for-memcg-locking-for-mglru-fix-2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=4552d8948db1907e9f33d3cdf76a7db07f6212d0;p=users%2Fjedix%2Flinux-maple.git

memcg-v1-no-need-for-memcg-locking-for-mglru-fix-2

folio_rcu() fixup, per Yu Zhao

Link: https://lkml.kernel.org/r/iwmabnye3nl4merealrawt3bdvfii2pwavwrddrqpraoveet7h@ezrsdhjwwej7
Signed-off-by: Shakeel Butt <shakeel.butt@linux.dev>

Cc: Hugh Dickins <hughd@google.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Muchun Song <muchun.song@linux.dev>
Cc: Roman Gushchin <roman.gushchin@linux.dev>
Cc: Yosry Ahmed <yosryahmed@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

diff --git a/mm/vmscan.c b/mm/vmscan.c
index 8862fcfb6000..745ff7b5c3a6 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -3353,7 +3353,7 @@ static struct folio *get_pfn_folio(unsigned long pfn, struct mem_cgroup *memcg,
 	if (folio_nid(folio) != pgdat->node_id)
 		return NULL;
 
-	if (folio_memcg_rcu(folio) != memcg)
+	if (folio_memcg(folio) != memcg)
 		return NULL;
 
 	/* file VMAs can contain anon pages from COW */