From: Wei Yang <richard.weiyang@gmail.com>
Date: Sun, 17 Aug 2025 03:26:47 +0000 (+0000)
Subject: mm/rmap: use folio_large_nr_pages() when we are sure it is a large folio
X-Git-Tag: v6.18-rc1~130^2~243
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5d5d75ff646c9b5e54f1c0018097d970dabafb74;p=thirdparty%2Fkernel%2Fstable.git

mm/rmap: use folio_large_nr_pages() when we are sure it is a large folio

Non-large folio is handled at the beginning, so it is a large folio for
sure.

Use folio_large_nr_pages() here like elsewhere.

Link: https://lkml.kernel.org/r/20250817032647.29147-3-richard.weiyang@gmail.com
Signed-off-by: Wei Yang <richard.weiyang@gmail.com>
Reviewed-by: Lorenzo Stoakes <lorenzo.stoakes@oracle.com>
Acked-by: David Hildenbrand <david@redhat.com>
Cc: Rik van Riel <riel@surriel.com>
Cc: Liam R. Howlett <Liam.Howlett@oracle.com>
Cc: Vlastimil Babka <vbabka@suse.cz>
Cc: Harry Yoo <harry.yoo@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

diff --git a/mm/rmap.c b/mm/rmap.c
index 2f8e7ce03685b..34333ae3bd80f 100644
--- a/mm/rmap.c
+++ b/mm/rmap.c
@@ -1702,7 +1702,7 @@ static __always_inline void __folio_remove_rmap(struct folio *folio,
 			nr = folio_sub_return_large_mapcount(folio, nr_pages, vma);
 			if (!nr) {
 				/* Now completely unmapped. */
-				nr = folio_nr_pages(folio);
+				nr = folio_large_nr_pages(folio);
 			} else {
 				partially_mapped = nr < folio_large_nr_pages(folio) &&
 						   !folio_entire_mapcount(folio);