Merge tag 'netfs-prep-20220318' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-block.git] / fs / afs / file.c

diff --git a/fs/afs/file.c b/fs/afs/file.c
index 2b68b207024818cc140b4e6b1833d98e90c5bfde..26292a110a8f9abf03471a402fdf567a4a6bfcc0 100644 (file)
--- a/fs/afs/file.c
+++ b/fs/afs/file.c
@@ -20,8 +20,8 @@
 
 static int afs_file_mmap(struct file *file, struct vm_area_struct *vma);
 static int afs_symlink_readpage(struct file *file, struct page *page);
-static void afs_invalidatepage(struct page *page, unsigned int offset,
-                              unsigned int length);
+static void afs_invalidate_folio(struct folio *folio, size_t offset,
+                              size_t length);
 static int afs_releasepage(struct page *page, gfp_t gfp_flags);
 
 static ssize_t afs_file_read_iter(struct kiocb *iocb, struct iov_iter *iter);
@@ -52,10 +52,10 @@ const struct inode_operations afs_file_inode_operations = {
 const struct address_space_operations afs_file_aops = {
        .readpage       = netfs_readpage,
        .readahead      = netfs_readahead,
-       .set_page_dirty = afs_set_page_dirty,
-       .launder_page   = afs_launder_page,
+       .dirty_folio    = afs_dirty_folio,
+       .launder_folio  = afs_launder_folio,
        .releasepage    = afs_releasepage,
-       .invalidatepage = afs_invalidatepage,
+       .invalidate_folio = afs_invalidate_folio,
        .write_begin    = afs_write_begin,
        .write_end      = afs_write_end,
        .writepage      = afs_writepage,
@@ -65,7 +65,7 @@ const struct address_space_operations afs_file_aops = {
 const struct address_space_operations afs_symlink_aops = {
        .readpage       = afs_symlink_readpage,
        .releasepage    = afs_releasepage,
-       .invalidatepage = afs_invalidatepage,
+       .invalidate_folio = afs_invalidate_folio,
 };
 
 static const struct vm_operations_struct afs_vm_ops = {
@@ -406,8 +406,8 @@ int afs_write_inode(struct inode *inode, struct writeback_control *wbc)
  * Adjust the dirty region of the page on truncation or full invalidation,
  * getting rid of the markers altogether if the region is entirely invalidated.
  */
-static void afs_invalidate_dirty(struct folio *folio, unsigned int offset,
-                                unsigned int length)
+static void afs_invalidate_dirty(struct folio *folio, size_t offset,
+                                size_t length)
 {
        struct afs_vnode *vnode = AFS_FS_I(folio_inode(folio));
        unsigned long priv;
@@ -464,16 +464,14 @@ full_invalidate:
  * - release a page and clean up its private data if offset is 0 (indicating
  *   the entire page)
  */
-static void afs_invalidatepage(struct page *page, unsigned int offset,
-                              unsigned int length)
+static void afs_invalidate_folio(struct folio *folio, size_t offset,
+                              size_t length)
 {
-       struct folio *folio = page_folio(page);
-
-       _enter("{%lu},%u,%u", folio_index(folio), offset, length);
+       _enter("{%lu},%zu,%zu", folio->index, offset, length);
 
-       BUG_ON(!PageLocked(page));
+       BUG_ON(!folio_test_locked(folio));
 
-       if (PagePrivate(page))
+       if (folio_get_private(folio))
                afs_invalidate_dirty(folio, offset, length);
 
        folio_wait_fscache(folio);