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

mm: use mapping_evict_folio() in truncate_error_page() 

We already have the folio and the mapping, so replace the call to
invalidate_inode_page() with mapping_evict_folio().

Link: https://lkml.kernel.org/r/20231108182809.602073-4-willy@infradead.org


Signed-off-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Cc: Naoya Horiguchi <naoya.horiguchi@nec.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 01d1e0e6

mm/memory-failure.c

+2 −2
Original line number Diff line number Diff line
@@ -930,10 +930,10 @@ static int delete_from_lru_cache(struct page *p) 
static int truncate_error_page(struct page *p, unsigned long pfn,

				struct address_space *mapping)

{

	struct folio *folio = page_folio(p);

	int ret = MF_FAILED;



	if (mapping->a_ops->error_remove_page) {

		struct folio *folio = page_folio(p);

		int err = mapping->a_ops->error_remove_page(mapping, p);



		if (err != 0)
@@ -947,7 +947,7 @@ static int truncate_error_page(struct page *p, unsigned long pfn, 
		 * If the file system doesn't support it just invalidate

		 * This fails on dirty or anything with private pages

		 */

		if (invalidate_inode_page(p))

		if (mapping_evict_folio(mapping, folio))

			ret = MF_RECOVERED;

		else

			pr_info("%#lx: Failed to invalidate\n",	pfn);