mm: Remove __delete_from_page_cache()

This wrapper is no longer used.  Remove it and all references to it.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>

diff --git a/fs/inode.c b/fs/inode.c
index bd4da9c5207eabb0cec8722ee3d30acd963169bf..d2bdc407c94b0e7e7e9d9745826f785e141f424e 100644 (file)
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -604,7 +604,7 @@ void clear_inode(struct inode *inode)
 {
        /*
         * We have to cycle the i_pages lock here because reclaim can be in the
-        * process of removing the last page (in __delete_from_page_cache())
+        * process of removing the last page (in __filemap_remove_folio())
         * and we must not free the mapping under it.
         */
        xa_lock_irq(&inode->i_data.i_pages);

diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h
index ce96866fbec4050c8826c9809b5156a15f6ba410..44b9c265a23451aba89bf70b3e3539b8c3ebf334 100644 (file)
--- a/include/linux/pagemap.h
+++ b/include/linux/pagemap.h
@@ -1107,10 +1107,6 @@ int filemap_add_folio(struct address_space *mapping, struct folio *folio,
 void filemap_remove_folio(struct folio *folio);
 void delete_from_page_cache(struct page *page);
 void __filemap_remove_folio(struct folio *folio, void *shadow);
-static inline void __delete_from_page_cache(struct page *page, void *shadow)
-{
-       __filemap_remove_folio(page_folio(page), shadow);
-}
 void replace_page_cache_page(struct page *old, struct page *new);
 void delete_from_page_cache_batch(struct address_space *mapping,
                                  struct folio_batch *fbatch);

diff --git a/mm/memory-failure.c b/mm/memory-failure.c
index b85661cbdc4aa06b2d4c713eff073ac0ca00a587..a859486ddda96e73671e6f2fa42cbadf3383fefe 100644 (file)
--- a/mm/memory-failure.c
+++ b/mm/memory-failure.c
@@ -1935,7 +1935,7 @@ try_again:
 
        /*
         * Now take care of user space mappings.
-        * Abort on fail: __delete_from_page_cache() assumes unmapped page.
+        * Abort on fail: __filemap_remove_folio() assumes unmapped page.
         */
        if (!hwpoison_user_mappings(p, pfn, flags, p)) {
                action_result(pfn, MF_MSG_UNMAP_FAILED, MF_IGNORED);

diff --git a/mm/shmem.c b/mm/shmem.c
index a6f56530813387b8767a0a98f51324de58a6584c..b42dfb01c634b80ba62a92c2880efb6d5fd2ef64 100644 (file)
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -392,7 +392,7 @@ void shmem_uncharge(struct inode *inode, long pages)
        struct shmem_inode_info *info = SHMEM_I(inode);
        unsigned long flags;
 
-       /* nrpages adjustment done by __delete_from_page_cache() or caller */
+       /* nrpages adjustment done by __filemap_remove_folio() or caller */
 
        spin_lock_irqsave(&info->lock, flags);
        info->alloced -= pages;

diff --git a/mm/truncate.c b/mm/truncate.c
index ab50d0d59a2afc29cc477b45ee28ff1cc8202e89..0b0708bf935f3e9b80a8042157c38b9219745401 100644 (file)
--- a/mm/truncate.c
+++ b/mm/truncate.c
@@ -443,7 +443,7 @@ EXPORT_SYMBOL(truncate_inode_pages_range);
  * mapping->invalidate_lock.
  *
  * Note: When this function returns, there can be a page in the process of
- * deletion (inside __delete_from_page_cache()) in the specified range.  Thus
+ * deletion (inside __filemap_remove_folio()) in the specified range.  Thus
  * mapping->nrpages can be non-zero when this function returns even after
  * truncation of the whole mapping.
  */