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

ufs: Convert ufs_change_blocknr() to take a folio

Now that ufs_new_fragments() has a folio, pass it to ufs_change_blocknr()
as a folio instead of converting it from folio to page to folio.
This removes the last use of struct page in UFS.

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
b57c010e 14bcb7bb

+4 -4
+4 -4
fs/ufs/balloc.c
··· 229 229 * situated at the end of file. 230 230 * 231 231 * We can come here from ufs_writepage or ufs_prepare_write, 232 - * locked_page is argument of these functions, so we already lock it. 232 + * locked_folio is argument of these functions, so we already lock it. 233 233 */ 234 234 static void ufs_change_blocknr(struct inode *inode, sector_t beg, 235 235 unsigned int count, sector_t oldb, 236 - sector_t newb, struct page *locked_page) 236 + sector_t newb, struct folio *locked_folio) 237 237 { 238 - struct folio *folio, *locked_folio = page_folio(locked_page); 238 + struct folio *folio; 239 239 const unsigned blks_per_page = 240 240 1 << (PAGE_SHIFT - inode->i_blkbits); 241 241 const unsigned mask = blks_per_page - 1; ··· 461 461 mutex_unlock(&UFS_SB(sb)->s_lock); 462 462 ufs_change_blocknr(inode, fragment - oldcount, oldcount, 463 463 uspi->s_sbbase + tmp, 464 - uspi->s_sbbase + result, &locked_folio->page); 464 + uspi->s_sbbase + result, locked_folio); 465 465 *err = 0; 466 466 write_seqlock(&UFS_I(inode)->meta_lock); 467 467 ufs_cpu_to_data_ptr(sb, p, result);