invalidate_complete_page2() currently open-codes page_cache_free_page(),
except for the part where it handles THP. Rather than adding that,
call page_cache_free_page() from invalidate_complete_page2().
Signed-off-by: Matthew Wilcox (Oracle) <willy@xxxxxxxxxxxxx>
---
mm/filemap.c | 3 +--
mm/internal.h | 1 +
mm/truncate.c | 5 +----
3 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/mm/filemap.c b/mm/filemap.c
index 62bc6affeb70..00de12d42bc4 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -228,8 +228,7 @@ void __delete_from_page_cache(struct page *page, void *shadow)
page_cache_delete(mapping, page, shadow);
}
-static void page_cache_free_page(struct address_space *mapping,
- struct page *page)
+void page_cache_free_page(struct address_space *mapping, struct page *page)
{
void (*freepage)(struct page *);
diff --git a/mm/internal.h b/mm/internal.h
index 5aca7d7bc57c..1391e3239547 100644
--- a/mm/internal.h
+++ b/mm/internal.h
@@ -623,4 +623,5 @@ struct migration_target_control {
};
bool truncate_inode_partial_page(struct page *page, loff_t start, loff_t end);
+void page_cache_free_page(struct address_space *mapping, struct page *page);
#endif /* __MM_INTERNAL_H */
diff --git a/mm/truncate.c b/mm/truncate.c
index 30653b2717d3..bed24857d1d2 100644
--- a/mm/truncate.c
+++ b/mm/truncate.c
@@ -603,10 +603,7 @@ invalidate_complete_page2(struct address_space *mapping, struct page *page)
__delete_from_page_cache(page, NULL);
xa_unlock_irqrestore(&mapping->i_pages, flags);
- if (mapping->a_ops->freepage)
- mapping->a_ops->freepage(page);
-
- put_page(page); /* pagecache ref */
+ page_cache_free_page(mapping, page);
return 1;
failed:
xa_unlock_irqrestore(&mapping->i_pages, flags);
--
2.28.0
