ufs: Pass a folio to ufs_new_fragments()

All callers now have a folio, pass it to ufs_new_fragments() instead
of converting back to a page.

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

diff --git a/fs/ufs/balloc.c b/fs/ufs/balloc.c
index c60006c5806c651dec983606f74ea9d232da70b8..e578e429c5d8945e2c386749c81bee507ba1ebc5 100644 (file)
--- a/fs/ufs/balloc.c
+++ b/fs/ufs/balloc.c
@@ -332,7 +332,7 @@ static void ufs_clear_frags(struct inode *inode, sector_t beg, unsigned int n,
 
 u64 ufs_new_fragments(struct inode *inode, void *p, u64 fragment,
                           u64 goal, unsigned count, int *err,
-                          struct page *locked_page)
+                          struct folio *locked_folio)
 {
        struct super_block * sb;
        struct ufs_sb_private_info * uspi;
@@ -412,7 +412,7 @@ u64 ufs_new_fragments(struct inode *inode, void *p, u64 fragment,
                result = ufs_alloc_fragments (inode, cgno, goal, count, err);
                if (result) {
                        ufs_clear_frags(inode, result + oldcount,
-                                       newcount - oldcount, locked_page != NULL);
+                                       newcount - oldcount, locked_folio != NULL);
                        *err = 0;
                        write_seqlock(&UFS_I(inode)->meta_lock);
                        ufs_cpu_to_data_ptr(sb, p, result);
@@ -436,7 +436,7 @@ u64 ufs_new_fragments(struct inode *inode, void *p, u64 fragment,
                                                fragment + count);
                read_sequnlock_excl(&UFS_I(inode)->meta_lock);
                ufs_clear_frags(inode, result + oldcount, newcount - oldcount,
-                               locked_page != NULL);
+                               locked_folio != NULL);
                mutex_unlock(&UFS_SB(sb)->s_lock);
                UFSD("EXIT, result %llu\n", (unsigned long long)result);
                return result;
@@ -457,11 +457,11 @@ u64 ufs_new_fragments(struct inode *inode, void *p, u64 fragment,
        result = ufs_alloc_fragments (inode, cgno, goal, request, err);
        if (result) {
                ufs_clear_frags(inode, result + oldcount, newcount - oldcount,
-                               locked_page != NULL);
+                               locked_folio != NULL);
                mutex_unlock(&UFS_SB(sb)->s_lock);
                ufs_change_blocknr(inode, fragment - oldcount, oldcount,
                                   uspi->s_sbbase + tmp,
-                                  uspi->s_sbbase + result, locked_page);
+                                  uspi->s_sbbase + result, &locked_folio->page);
                *err = 0;
                write_seqlock(&UFS_I(inode)->meta_lock);
                ufs_cpu_to_data_ptr(sb, p, result);

diff --git a/fs/ufs/inode.c b/fs/ufs/inode.c
index 30e5d695d74d5d36fa3387ffbc2ea1d89285b361..7dc38fdef2eab9964f5bb9621a03df3b423be3cc 100644 (file)
--- a/fs/ufs/inode.c
+++ b/fs/ufs/inode.c
@@ -239,7 +239,7 @@ ufs_extend_tail(struct inode *inode, u64 writes_to,
        p = ufs_get_direct_data_ptr(uspi, ufsi, block);
        tmp = ufs_new_fragments(inode, p, lastfrag, ufs_data_ptr_to_cpu(sb, p),
                                new_size - (lastfrag & uspi->s_fpbmask), err,
-                               &locked_folio->page);
+                               locked_folio);
        return tmp != 0;
 }
 
@@ -250,7 +250,7 @@ ufs_extend_tail(struct inode *inode, u64 writes_to,
  * @new_fragment: number of new allocated fragment(s)
  * @err: we set it if something wrong
  * @new: we set it if we allocate new block
- * @locked_page: for ufs_new_fragments()
+ * @locked_folio: for ufs_new_fragments()
  */
 static u64 ufs_inode_getfrag(struct inode *inode, unsigned index,
                  sector_t new_fragment, int *err,
@@ -282,7 +282,7 @@ static u64 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_folio->page);
+                               goal, nfrags, err, locked_folio);
 
        if (!tmp) {
                *err = -ENOSPC;
@@ -347,7 +347,7 @@ static u64 ufs_inode_getblock(struct inode *inode, u64 ind_block,
        else
                goal = bh->b_blocknr + uspi->s_fpb;
        tmp = ufs_new_fragments(inode, p, ufs_blknum(new_fragment), goal,
-                               uspi->s_fpb, err, &locked_folio->page);
+                               uspi->s_fpb, err, locked_folio);
        if (!tmp)
                goto out;
 

diff --git a/fs/ufs/ufs.h b/fs/ufs/ufs.h
index c7638e62ffe86066b6a8c46b707445018d3eb439..e7df65dd43510dea6be3c60abd4a9e7a067fb134 100644 (file)
--- a/fs/ufs/ufs.h
+++ b/fs/ufs/ufs.h
@@ -88,10 +88,10 @@ struct ufs_inode_info {
 #endif
 
 /* balloc.c */
-extern void ufs_free_fragments (struct inode *, u64, unsigned);
-extern void ufs_free_blocks (struct inode *, u64, unsigned);
-extern u64 ufs_new_fragments(struct inode *, void *, u64, u64,
-                            unsigned, int *, struct page *);
+void ufs_free_fragments (struct inode *, u64 fragment, unsigned count);
+void ufs_free_blocks (struct inode *, u64 fragment, unsigned count);
+u64 ufs_new_fragments(struct inode *, void *, u64 fragment, u64 goal,
+               unsigned count, int *err, struct folio *);
 
 /* cylinder.c */
 extern struct ufs_cg_private_info * ufs_load_cylinder (struct super_block *, unsigned);