Skip to content

Commit fae9bc4

Browse files
author
Matthew Wilcox (Oracle)
committed
truncate: Convert invalidate_inode_pages2_range() to use a folio
If we're going to unmap a folio, we have to be sure to unmap the entire folio, not just the part of it which lies after the search index. We cannot yet remove the struct page from invalidate_inode_pages2_range() because the page pointer in the pvec might be a shadow/dax/swap entry instead of actually a page. Signed-off-by: Matthew Wilcox (Oracle) <[email protected]> Reviewed-by: Christoph Hellwig <[email protected]> Reviewed-by: William Kucharski <[email protected]>
1 parent ccbbf76 commit fae9bc4

File tree

1 file changed

+17
-14
lines changed

1 file changed

+17
-14
lines changed

mm/truncate.c

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -642,8 +642,9 @@ int invalidate_inode_pages2_range(struct address_space *mapping,
642642
while (find_get_entries(mapping, index, end, &pvec, indices)) {
643643
for (i = 0; i < pagevec_count(&pvec); i++) {
644644
struct page *page = pvec.pages[i];
645+
struct folio *folio;
645646

646-
/* We rely upon deletion not changing page->index */
647+
/* We rely upon deletion not changing folio->index */
647648
index = indices[i];
648649

649650
if (xa_is_value(page)) {
@@ -652,37 +653,39 @@ int invalidate_inode_pages2_range(struct address_space *mapping,
652653
ret = -EBUSY;
653654
continue;
654655
}
656+
folio = page_folio(page);
655657

656-
if (!did_range_unmap && page_mapped(page)) {
658+
if (!did_range_unmap && folio_mapped(folio)) {
657659
/*
658-
* If page is mapped, before taking its lock,
660+
* If folio is mapped, before taking its lock,
659661
* zap the rest of the file in one hit.
660662
*/
661663
unmap_mapping_pages(mapping, index,
662664
(1 + end - index), false);
663665
did_range_unmap = 1;
664666
}
665667

666-
lock_page(page);
667-
WARN_ON(page_to_index(page) != index);
668-
if (page->mapping != mapping) {
669-
unlock_page(page);
668+
folio_lock(folio);
669+
VM_BUG_ON_FOLIO(!folio_contains(folio, index), folio);
670+
if (folio->mapping != mapping) {
671+
folio_unlock(folio);
670672
continue;
671673
}
672-
wait_on_page_writeback(page);
674+
folio_wait_writeback(folio);
673675

674-
if (page_mapped(page))
675-
unmap_mapping_folio(page_folio(page));
676-
BUG_ON(page_mapped(page));
676+
if (folio_mapped(folio))
677+
unmap_mapping_folio(folio);
678+
BUG_ON(folio_mapped(folio));
677679

678-
ret2 = do_launder_page(mapping, page);
680+
ret2 = do_launder_page(mapping, &folio->page);
679681
if (ret2 == 0) {
680-
if (!invalidate_complete_page2(mapping, page))
682+
if (!invalidate_complete_page2(mapping,
683+
&folio->page))
681684
ret2 = -EBUSY;
682685
}
683686
if (ret2 < 0)
684687
ret = ret2;
685-
unlock_page(page);
688+
folio_unlock(folio);
686689
}
687690
pagevec_remove_exceptionals(&pvec);
688691
pagevec_release(&pvec);

0 commit comments

Comments
 (0)