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

truncate: Add invalidate_complete_folio2()

Browse Source 
Convert invalidate_complete_page2() to invalidate_complete_folio2().
Use filemap_free_folio() to free the page instead of calling ->freepage
manually.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: William Kucharski <william.kucharski@oracle.com>
This commit is contained in:
Matthew Wilcox (Oracle)
2021-07-28 15:52:34 -04:00
parent fae9bc4a90
commit 78f426608f
3 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mm/filemap.c
View File

@@ -229,8 +229,7 @@ void __filemap_remove_folio(struct folio *folio, void *shadow)
page_cache_delete(mapping, folio, shadow); page_cache_delete(mapping, folio, shadow);
} }
static void filemap_free_folio(struct address_space *mapping, void filemap_free_folio(struct address_space *mapping, struct folio *folio)
struct folio *folio)
{ {
void (*freepage)(struct page *); void (*freepage)(struct page *);

1
mm/internal.h
View File

@@ -92,6 +92,7 @@ static inline void force_page_cache_readahead(struct address_space *mapping,
unsigned find_lock_entries(struct address_space *mapping, pgoff_t start, unsigned find_lock_entries(struct address_space *mapping, pgoff_t start,
pgoff_t end, struct pagevec *pvec, pgoff_t *indices); pgoff_t end, struct pagevec *pvec, pgoff_t *indices);
void filemap_free_folio(struct address_space *mapping, struct folio *folio);
int truncate_inode_folio(struct address_space *mapping, struct folio *folio); int truncate_inode_folio(struct address_space *mapping, struct folio *folio);
/** /**

23
mm/truncate.c
View File

@@ -571,31 +571,29 @@ void invalidate_mapping_pagevec(struct address_space *mapping,
* shrink_page_list() has a temp ref on them, or because they're transiently * shrink_page_list() has a temp ref on them, or because they're transiently
* sitting in the lru_cache_add() pagevecs. * sitting in the lru_cache_add() pagevecs.
*/ */
static int static int invalidate_complete_folio2(struct address_space *mapping,
invalidate_complete_page2(struct address_space *mapping, struct page *page) struct folio *folio)
{ {
if (page->mapping != mapping) if (folio->mapping != mapping)
return 0; return 0;
if (page_has_private(page) && !try_to_release_page(page, GFP_KERNEL)) if (folio_has_private(folio) &&
!filemap_release_folio(folio, GFP_KERNEL))
return 0; return 0;
spin_lock(&mapping->host->i_lock); spin_lock(&mapping->host->i_lock);
xa_lock_irq(&mapping->i_pages); xa_lock_irq(&mapping->i_pages);
if (PageDirty(page)) if (folio_test_dirty(folio))
goto failed; goto failed;
BUG_ON(page_has_private(page)); BUG_ON(folio_has_private(folio));
__delete_from_page_cache(page, NULL); __filemap_remove_folio(folio, NULL);
xa_unlock_irq(&mapping->i_pages); xa_unlock_irq(&mapping->i_pages);
if (mapping_shrinkable(mapping)) if (mapping_shrinkable(mapping))
inode_add_lru(mapping->host); inode_add_lru(mapping->host);
spin_unlock(&mapping->host->i_lock); spin_unlock(&mapping->host->i_lock);
if (mapping->a_ops->freepage) filemap_free_folio(mapping, folio);
mapping->a_ops->freepage(page);
put_page(page); /* pagecache ref */
return 1; return 1;
failed: failed:
xa_unlock_irq(&mapping->i_pages); xa_unlock_irq(&mapping->i_pages);
@@ -679,8 +677,7 @@ int invalidate_inode_pages2_range(struct address_space *mapping,
ret2 = do_launder_page(mapping, &folio->page); ret2 = do_launder_page(mapping, &folio->page);
if (ret2 == 0) { if (ret2 == 0) {
if (!invalidate_complete_page2(mapping, if (!invalidate_complete_folio2(mapping, folio))
&folio->page))
ret2 = -EBUSY; ret2 = -EBUSY;
} }
if (ret2 < 0) if (ret2 < 0)