diff options
| author | Matthew Wilcox (Oracle) <willy@infradead.org> | 2024-10-05 19:02:04 +0100 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2024-10-18 17:35:31 -0400 |
| commit | d9036c488c6ed503e0c251236abae2b7ed679847 (patch) | |
| tree | 11e92cec6bde1865f41d479d20c6d1c9a2b81fd9 /fs/ufs/inode.c | |
| parent | 6b103cc0ba58c680ab4e59dfa2fca4ceedfb5495 (diff) | |
| download | lwn-d9036c488c6ed503e0c251236abae2b7ed679847.tar.gz lwn-d9036c488c6ed503e0c251236abae2b7ed679847.zip | |
ufs: Convert ufs_inode_getblock() 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) <willy@infradead.org>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/ufs/inode.c')
| -rw-r--r-- | fs/ufs/inode.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/fs/ufs/inode.c b/fs/ufs/inode.c index a3475afb3c26..912950ee5104 100644 --- a/fs/ufs/inode.c +++ b/fs/ufs/inode.c @@ -309,12 +309,11 @@ out: * (block will hold this fragment and also uspi->s_fpb-1) * @err: see ufs_inode_getfrag() * @new: see ufs_inode_getfrag() - * @locked_page: see ufs_inode_getfrag() + * @locked_folio: see ufs_inode_getfrag() */ -static u64 -ufs_inode_getblock(struct inode *inode, u64 ind_block, - unsigned index, sector_t new_fragment, int *err, - int *new, struct page *locked_page) +static u64 ufs_inode_getblock(struct inode *inode, u64 ind_block, + unsigned index, sector_t new_fragment, int *err, + int *new, struct folio *locked_folio) { struct super_block *sb = inode->i_sb; struct ufs_sb_private_info *uspi = UFS_SB(sb)->s_uspi; @@ -349,7 +348,7 @@ 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_page); + uspi->s_fpb, err, &locked_folio->page); if (!tmp) goto out; @@ -430,7 +429,7 @@ static int ufs_getfrag_block(struct inode *inode, sector_t fragment, struct buff phys64 = ufs_inode_getblock(inode, phys64, offsets[i], fragment, &err, NULL, NULL); phys64 = ufs_inode_getblock(inode, phys64, offsets[depth - 1], - fragment, &err, &new, bh_result->b_page); + fragment, &err, &new, bh_result->b_folio); } out: if (phys64) { |