Skip to content

Commit 24a87a0

Browse files
Matthew Wilcox (Oracle)Al Viro
authored andcommitted
ufs: Convert ufs_inode_getfrag() to take a folio
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) <[email protected]> Signed-off-by: Al Viro <[email protected]>
1 parent b6250a0 commit 24a87a0

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

fs/ufs/inode.c

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -252,10 +252,9 @@ ufs_extend_tail(struct inode *inode, u64 writes_to,
252252
* @new: we set it if we allocate new block
253253
* @locked_page: for ufs_new_fragments()
254254
*/
255-
static u64
256-
ufs_inode_getfrag(struct inode *inode, unsigned index,
255+
static u64 ufs_inode_getfrag(struct inode *inode, unsigned index,
257256
sector_t new_fragment, int *err,
258-
int *new, struct page *locked_page)
257+
int *new, struct folio *locked_folio)
259258
{
260259
struct ufs_inode_info *ufsi = UFS_I(inode);
261260
struct super_block *sb = inode->i_sb;
@@ -283,7 +282,7 @@ ufs_inode_getfrag(struct inode *inode, unsigned index,
283282
goal += uspi->s_fpb;
284283
}
285284
tmp = ufs_new_fragments(inode, p, ufs_blknum(new_fragment),
286-
goal, nfrags, err, locked_page);
285+
goal, nfrags, err, &locked_folio->page);
287286

288287
if (!tmp) {
289288
*err = -ENOSPC;
@@ -420,7 +419,7 @@ static int ufs_getfrag_block(struct inode *inode, sector_t fragment, struct buff
420419

421420
if (depth == 1) {
422421
phys64 = ufs_inode_getfrag(inode, offsets[0], fragment,
423-
&err, &new, bh_result->b_page);
422+
&err, &new, bh_result->b_folio);
424423
} else {
425424
int i;
426425
phys64 = ufs_inode_getfrag(inode, offsets[0], fragment,

0 commit comments

Comments
 (0)