iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mm: Remove __delete_from_page_cache()

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

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
This commit is contained in:
Matthew Wilcox (Oracle) 2022-06-28 20:41:40 -04:00
parent fb5c2029f8
commit 6ffcd825e7
5 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/inode.c
View File

@ -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 * 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. * and we must not free the mapping under it.
*/ */
xa_lock_irq(&inode->i_data.i_pages); xa_lock_irq(&inode->i_data.i_pages);

4
include/linux/pagemap.h
View File

@ -1107,10 +1107,6 @@ int filemap_add_folio(struct address_space *mapping, struct folio *folio,
void filemap_remove_folio(struct folio *folio); void filemap_remove_folio(struct folio *folio);
void delete_from_page_cache(struct page *page); void delete_from_page_cache(struct page *page);
void __filemap_remove_folio(struct folio *folio, void *shadow); 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 replace_page_cache_page(struct page *old, struct page *new);
void delete_from_page_cache_batch(struct address_space *mapping, void delete_from_page_cache_batch(struct address_space *mapping,
struct folio_batch *fbatch); struct folio_batch *fbatch);

2
mm/memory-failure.c
View File

@ -1935,7 +1935,7 @@ try_again:
/* /*
* Now take care of user space mappings. * 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)) { if (!hwpoison_user_mappings(p, pfn, flags, p)) {
action_result(pfn, MF_MSG_UNMAP_FAILED, MF_IGNORED); action_result(pfn, MF_MSG_UNMAP_FAILED, MF_IGNORED);

2
mm/shmem.c
View File

@ -392,7 +392,7 @@ void shmem_uncharge(struct inode *inode, long pages)
struct shmem_inode_info *info = SHMEM_I(inode); struct shmem_inode_info *info = SHMEM_I(inode);
unsigned long flags; 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); spin_lock_irqsave(&info->lock, flags);
info->alloced -= pages; info->alloced -= pages;

2
mm/truncate.c
View File

@ -443,7 +443,7 @@ EXPORT_SYMBOL(truncate_inode_pages_range);
* mapping->invalidate_lock. * mapping->invalidate_lock.
* *
* Note: When this function returns, there can be a page in the process of * 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 * mapping->nrpages can be non-zero when this function returns even after
* truncation of the whole mapping. * truncation of the whole mapping.
*/ */