ntfs3: convert ntfs_get_block_vbo() to use a folio

Remove a user of set_bh_page().

Link: https://lkml.kernel.org/r/20230713035512.4139457-6-willy@infradead.org
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>
Cc: Nathan Chancellor <nathan@kernel.org>
Cc: Nick Desaulniers <ndesaulniers@google.com>
Cc: Tom Rix <trix@redhat.com>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: Christian Brauner <brauner@kernel.org>
Cc: David Sterba <dsterba@suse.com>
Cc: Jan Kara <jack@suse.com>
Cc: Pankaj Raghav <p.raghav@samsung.com>
Cc: "Theodore Ts'o" <tytso@mit.edu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/fs/ntfs3/inode.c b/fs/ntfs3/inode.c
index dc7e7ab701c6a78cefec6b2c85b22396353d955e..8ae572aacc692bf35837da58f10c346da8a68d10 100644 (file)
--- a/fs/ntfs3/inode.c
+++ b/fs/ntfs3/inode.c
@@ -554,7 +554,7 @@ static noinline int ntfs_get_block_vbo(struct inode *inode, u64 vbo,
        struct super_block *sb = inode->i_sb;
        struct ntfs_sb_info *sbi = sb->s_fs_info;
        struct ntfs_inode *ni = ntfs_i(inode);
-       struct page *page = bh->b_page;
+       struct folio *folio = bh->b_folio;
        u8 cluster_bits = sbi->cluster_bits;
        u32 block_size = sb->s_blocksize;
        u64 bytes, lbo, valid;
@@ -569,7 +569,7 @@ static noinline int ntfs_get_block_vbo(struct inode *inode, u64 vbo,
 
        if (is_resident(ni)) {
                ni_lock(ni);
-               err = attr_data_read_resident(ni, page);
+               err = attr_data_read_resident(ni, &folio->page);
                ni_unlock(ni);
 
                if (!err)
@@ -642,17 +642,17 @@ static noinline int ntfs_get_block_vbo(struct inode *inode, u64 vbo,
                 */
                bytes = block_size;
 
-               if (page) {
+               if (folio) {
                        u32 voff = valid - vbo;
 
                        bh->b_size = block_size;
                        off = vbo & (PAGE_SIZE - 1);
-                       set_bh_page(bh, page, off);
+                       folio_set_bh(bh, folio, off);
 
                        err = bh_read(bh, 0);
                        if (err < 0)
                                goto out;
-                       zero_user_segment(page, off + voff, off + block_size);
+                       folio_zero_segment(folio, off + voff, off + block_size);
                }
        }