p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

filemap: Convert page_cache_delete_batch to folios 

Saves one call to compound_head() and reduces text size by 15 bytes.

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-03-12 23:13:46 -05:00
parent 65bca53b5f
commit 1afd7ae51f
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
mm/filemap.c
View File

@ -290,15 +290,15 @@ static void page_cache_delete_batch(struct address_space *mapping,
XA_STATE(xas, &mapping->i_pages, pvec->pages[0]->index); XA_STATE(xas, &mapping->i_pages, pvec->pages[0]->index);
int total_pages = 0; int total_pages = 0;
int i = 0; int i = 0;
struct page *page; struct folio *folio;
mapping_set_update(&xas, mapping); mapping_set_update(&xas, mapping);
xas_for_each(&xas, page, ULONG_MAX) { xas_for_each(&xas, folio, ULONG_MAX) {
if (i >= pagevec_count(pvec)) if (i >= pagevec_count(pvec))
break; break;
/* A swap/dax/shadow entry got inserted? Skip it. */ /* A swap/dax/shadow entry got inserted? Skip it. */
if (xa_is_value(page)) if (xa_is_value(folio))
continue; continue;
/* /*
* A page got inserted in our range? Skip it. We have our * A page got inserted in our range? Skip it. We have our
@ -307,16 +307,16 @@ static void page_cache_delete_batch(struct address_space *mapping,
* means our page has been removed, which shouldn't be * means our page has been removed, which shouldn't be
* possible because we're holding the PageLock. * possible because we're holding the PageLock.
*/ */
if (page != pvec->pages[i]) { if (&folio->page != pvec->pages[i]) {
VM_BUG_ON_PAGE(page->index > pvec->pages[i]->index, VM_BUG_ON_FOLIO(folio->index >
page); pvec->pages[i]->index, folio);
continue; continue;
} }
WARN_ON_ONCE(!PageLocked(page)); WARN_ON_ONCE(!folio_test_locked(folio));
if (page->index == xas.xa_index) if (folio->index == xas.xa_index)
page->mapping = NULL; folio->mapping = NULL;
/* Leave page->index set: truncation lookup relies on it */ /* Leave page->index set: truncation lookup relies on it */
/* /*
@ -324,7 +324,7 @@ static void page_cache_delete_batch(struct address_space *mapping,
* page or the index is of the last sub-page of this compound * page or the index is of the last sub-page of this compound
* page. * page.
*/ */
if (page->index + compound_nr(page) - 1 == xas.xa_index) if (folio->index + folio_nr_pages(folio) - 1 == xas.xa_index)
i++; i++;
xas_store(&xas, NULL); xas_store(&xas, NULL);
total_pages++; total_pages++;