Commit 284a344e authored by Vishal Moola (Oracle)'s avatar Vishal Moola (Oracle) Committed by Andrew Morton
Browse files

khugepage: replace lru_cache_add() with folio_add_lru() 

Replaces some calls with their folio equivalents.  This is in preparation
for the removal of lru_cache_add().  This replaces 3 calls to
compound_head() with 1.

Link: https://lkml.kernel.org/r/20221101175326.13265-5-vishal.moola@gmail.com


Signed-off-by: default avatarVishal Moola (Oracle) <vishal.moola@gmail.com>
Reviewed-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Cc: Mike Kravetz <mike.kravetz@oracle.com>
Cc: Miklos Szeredi <mszeredi@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 28965f0f

mm/khugepaged.c

+7 −4
Original line number Diff line number Diff line
@@ -2013,6 +2013,7 @@ static int collapse_file(struct mm_struct *mm, unsigned long addr, 


	if (result == SCAN_SUCCEED) {

		struct page *page, *tmp;

		struct folio *folio;



		/*

		 * Replacing old pages with new one has succeeded, now we
@@ -2040,11 +2041,13 @@ static int collapse_file(struct mm_struct *mm, unsigned long addr, 
			index++;

		}



		SetPageUptodate(hpage);

		page_ref_add(hpage, HPAGE_PMD_NR - 1);

		folio = page_folio(hpage);

		folio_mark_uptodate(folio);

		folio_ref_add(folio, HPAGE_PMD_NR - 1);



		if (is_shmem)

			set_page_dirty(hpage);

		lru_cache_add(hpage);

			folio_mark_dirty(folio);

		folio_add_lru(folio);



		/*

		 * Remove pte page tables, so we can re-fault the page as huge.