erofs: Convert from invalidatepage to invalidate_folio
authorMatthew Wilcox (Oracle) <willy@infradead.org>
Wed, 9 Feb 2022 20:21:42 +0000 (20:21 +0000)
committerMatthew Wilcox (Oracle) <willy@infradead.org>
Tue, 15 Mar 2022 12:23:29 +0000 (08:23 -0400)
A straightforward conversion.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Tested-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
Acked-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
Tested-by: Mike Marshall <hubcap@omnibond.com> # orangefs
Tested-by: David Howells <dhowells@redhat.com> # afs
fs/erofs/super.c

index 915eefe..a64c422 100644 (file)
@@ -535,25 +535,24 @@ static int erofs_managed_cache_releasepage(struct page *page, gfp_t gfp_mask)
        return ret;
 }
 
-static void erofs_managed_cache_invalidatepage(struct page *page,
-                                              unsigned int offset,
-                                              unsigned int length)
+static void erofs_managed_cache_invalidate_folio(struct folio *folio,
+                                              size_t offset, size_t length)
 {
-       const unsigned int stop = length + offset;
+       const size_t stop = length + offset;
 
-       DBG_BUGON(!PageLocked(page));
+       DBG_BUGON(!folio_test_locked(folio));
 
        /* Check for potential overflow in debug mode */
-       DBG_BUGON(stop > PAGE_SIZE || stop < length);
+       DBG_BUGON(stop > folio_size(folio) || stop < length);
 
-       if (offset == 0 && stop == PAGE_SIZE)
-               while (!erofs_managed_cache_releasepage(page, GFP_NOFS))
+       if (offset == 0 && stop == folio_size(folio))
+               while (!erofs_managed_cache_releasepage(&folio->page, GFP_NOFS))
                        cond_resched();
 }
 
 static const struct address_space_operations managed_cache_aops = {
        .releasepage = erofs_managed_cache_releasepage,
-       .invalidatepage = erofs_managed_cache_invalidatepage,
+       .invalidate_folio = erofs_managed_cache_invalidate_folio,
 };
 
 static int erofs_init_managed_cache(struct super_block *sb)