Commit 7459c149 authored by Matthew Wilcox (Oracle)'s avatar Matthew Wilcox (Oracle) Committed by Andrew Morton
Browse files

khugepaged: call shmem_get_folio() 

shmem_getpage() is being removed, so call its replacement and find the
precise page ourselves.

Link: https://lkml.kernel.org/r/20220902194653.1739778-32-willy@infradead.org


Signed-off-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent e4b57722

mm/khugepaged.c

+5 −2
Original line number Diff line number Diff line
@@ -1647,13 +1647,16 @@ static int collapse_file(struct mm_struct *mm, struct file *file, 
			}



			if (xa_is_value(page) || !PageUptodate(page)) {

				struct folio *folio;



				xas_unlock_irq(&xas);

				/* swap in or instantiate fallocated page */

				if (shmem_getpage(mapping->host, index, &page,

						  SGP_NOALLOC)) {

				if (shmem_get_folio(mapping->host, index,

						&folio, SGP_NOALLOC)) {

					result = SCAN_FAIL;

					goto xa_unlocked;

				}

				page = folio_file_page(folio, index);

			} else if (trylock_page(page)) {

				get_page(page);

				xas_unlock_irq(&xas);

mm/shmem.c

+2 −2
Original line number Diff line number Diff line
@@ -3158,7 +3158,7 @@ static const char *shmem_get_link(struct dentry *dentry, 
		folio = filemap_get_folio(inode->i_mapping, 0);

		if (!folio)

			return ERR_PTR(-ECHILD);

		if (PageHWPoison(&folio->page) ||

		if (PageHWPoison(folio_page(folio, 0)) ||

		    !folio_test_uptodate(folio)) {

			folio_put(folio);

			return ERR_PTR(-ECHILD);
@@ -3169,7 +3169,7 @@ static const char *shmem_get_link(struct dentry *dentry, 
			return ERR_PTR(error);

		if (!folio)

			return ERR_PTR(-ECHILD);

		if (PageHWPoison(&folio->page)) {

		if (PageHWPoison(folio_page(folio, 0))) {

			folio_unlock(folio);

			folio_put(folio);

			return ERR_PTR(-ECHILD);