]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
ufs: Convert ufs_inode_getfrag() to take a folio
authorMatthew Wilcox (Oracle) <willy@infradead.org>
Sat, 5 Oct 2024 18:02:06 +0000 (19:02 +0100)
committerAl Viro <viro@zeniv.linux.org.uk>
Fri, 18 Oct 2024 21:35:31 +0000 (17:35 -0400)
Pass bh->b_folio instead of bh->b_page.  They're in a union, so no
code change expected.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
fs/ufs/inode.c

index 1d3eb485df417906b4852d9de63b2455d6ea9738..30e5d695d74d5d36fa3387ffbc2ea1d89285b361 100644 (file)
@@ -252,10 +252,9 @@ ufs_extend_tail(struct inode *inode, u64 writes_to,
  * @new: we set it if we allocate new block
  * @locked_page: for ufs_new_fragments()
  */
-static u64
-ufs_inode_getfrag(struct inode *inode, unsigned index,
+static u64 ufs_inode_getfrag(struct inode *inode, unsigned index,
                  sector_t new_fragment, int *err,
-                 int *new, struct page *locked_page)
+                 int *new, struct folio *locked_folio)
 {
        struct ufs_inode_info *ufsi = UFS_I(inode);
        struct super_block *sb = inode->i_sb;
@@ -283,7 +282,7 @@ ufs_inode_getfrag(struct inode *inode, unsigned index,
                        goal += uspi->s_fpb;
        }
        tmp = ufs_new_fragments(inode, p, ufs_blknum(new_fragment),
-                               goal, nfrags, err, locked_page);
+                               goal, nfrags, err, &locked_folio->page);
 
        if (!tmp) {
                *err = -ENOSPC;
@@ -420,7 +419,7 @@ static int ufs_getfrag_block(struct inode *inode, sector_t fragment, struct buff
 
        if (depth == 1) {
                phys64 = ufs_inode_getfrag(inode, offsets[0], fragment,
-                                          &err, &new, bh_result->b_page);
+                                          &err, &new, bh_result->b_folio);
        } else {
                int i;
                phys64 = ufs_inode_getfrag(inode, offsets[0], fragment,