Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Matthew Wilcox (Oracle) and committed by
Al Viro
d9036c48 6b103cc0

+6 -7
+6 -7
fs/ufs/inode.c
··· 309 309 * (block will hold this fragment and also uspi->s_fpb-1) 310 310 * @err: see ufs_inode_getfrag() 311 311 * @new: see ufs_inode_getfrag() 312 - * @locked_page: see ufs_inode_getfrag() 312 + * @locked_folio: see ufs_inode_getfrag() 313 313 */ 314 - static u64 315 - ufs_inode_getblock(struct inode *inode, u64 ind_block, 316 - unsigned index, sector_t new_fragment, int *err, 317 - int *new, struct page *locked_page) 314 + static u64 ufs_inode_getblock(struct inode *inode, u64 ind_block, 315 + unsigned index, sector_t new_fragment, int *err, 316 + int *new, struct folio *locked_folio) 318 317 { 319 318 struct super_block *sb = inode->i_sb; 320 319 struct ufs_sb_private_info *uspi = UFS_SB(sb)->s_uspi; ··· 348 349 else 349 350 goal = bh->b_blocknr + uspi->s_fpb; 350 351 tmp = ufs_new_fragments(inode, p, ufs_blknum(new_fragment), goal, 351 - uspi->s_fpb, err, locked_page); 352 + uspi->s_fpb, err, &locked_folio->page); 352 353 if (!tmp) 353 354 goto out; 354 355 ··· 429 430 phys64 = ufs_inode_getblock(inode, phys64, offsets[i], 430 431 fragment, &err, NULL, NULL); 431 432 phys64 = ufs_inode_getblock(inode, phys64, offsets[depth - 1], 432 - fragment, &err, &new, bh_result->b_page); 433 + fragment, &err, &new, bh_result->b_folio); 433 434 } 434 435 out: 435 436 if (phys64) {