Merge tag 'f2fs-for-6.0' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk...

[linux-2.6-microblaze.git] / fs / f2fs / compress.c

diff --git a/fs/f2fs/compress.c b/fs/f2fs/compress.c
index 87bf06e..70e9707 100644 (file)
--- a/fs/f2fs/compress.c
+++ b/fs/f2fs/compress.c
@@ -1906,45 +1906,40 @@ bool f2fs_load_compressed_page(struct f2fs_sb_info *sbi, struct page *page,
 void f2fs_invalidate_compress_pages(struct f2fs_sb_info *sbi, nid_t ino)
 {
        struct address_space *mapping = sbi->compress_inode->i_mapping;
-       struct pagevec pvec;
+       struct folio_batch fbatch;
        pgoff_t index = 0;
        pgoff_t end = MAX_BLKADDR(sbi);
 
        if (!mapping->nrpages)
                return;
 
-       pagevec_init(&pvec);
+       folio_batch_init(&fbatch);
 
        do {
-               unsigned int nr_pages;
-               int i;
+               unsigned int nr, i;
 
-               nr_pages = pagevec_lookup_range(&pvec, mapping,
-                                               &index, end - 1);
-               if (!nr_pages)
+               nr = filemap_get_folios(mapping, &index, end - 1, &fbatch);
+               if (!nr)
                        break;
 
-               for (i = 0; i < nr_pages; i++) {
-                       struct page *page = pvec.pages[i];
-
-                       if (page->index > end)
-                               break;
+               for (i = 0; i < nr; i++) {
+                       struct folio *folio = fbatch.folios[i];
 
-                       lock_page(page);
-                       if (page->mapping != mapping) {
-                               unlock_page(page);
+                       folio_lock(folio);
+                       if (folio->mapping != mapping) {
+                               folio_unlock(folio);
                                continue;
                        }
 
-                       if (ino != get_page_private_data(page)) {
-                               unlock_page(page);
+                       if (ino != get_page_private_data(&folio->page)) {
+                               folio_unlock(folio);
                                continue;
                        }
 
-                       generic_error_remove_page(mapping, page);
-                       unlock_page(page);
+                       generic_error_remove_page(mapping, &folio->page);
+                       folio_unlock(folio);
                }
-               pagevec_release(&pvec);
+               folio_batch_release(&fbatch);
                cond_resched();
        } while (index < end);
 }