Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-21 19:41:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

ufs: Convert ufs_change_blocknr() to take a folio

Browse Source 
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>
This commit is contained in:
Matthew Wilcox (Oracle) 2024-10-05 19:02:08 +01:00 committed by Al Viro
parent 14bcb7bb68
commit b57c010e70
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fs/ufs/balloc.c
View File

@ -229,13 +229,13 @@ failed:
* situated at the end of file. * situated at the end of file.
* *
* We can come here from ufs_writepage or ufs_prepare_write, * We can come here from ufs_writepage or ufs_prepare_write,
* locked_page is argument of these functions, so we already lock it. * locked_folio is argument of these functions, so we already lock it.
*/ */
static void ufs_change_blocknr(struct inode *inode, sector_t beg, static void ufs_change_blocknr(struct inode *inode, sector_t beg,
unsigned int count, sector_t oldb, unsigned int count, sector_t oldb,
sector_t newb, struct page *locked_page) sector_t newb, struct folio *locked_folio)
{ {
struct folio *folio, *locked_folio = page_folio(locked_page); struct folio *folio;
const unsigned blks_per_page = const unsigned blks_per_page =
1 << (PAGE_SHIFT - inode->i_blkbits); 1 << (PAGE_SHIFT - inode->i_blkbits);
const unsigned mask = blks_per_page - 1; const unsigned mask = blks_per_page - 1;
@ -461,7 +461,7 @@ u64 ufs_new_fragments(struct inode *inode, void *p, u64 fragment,
mutex_unlock(&UFS_SB(sb)->s_lock); mutex_unlock(&UFS_SB(sb)->s_lock);
ufs_change_blocknr(inode, fragment - oldcount, oldcount, ufs_change_blocknr(inode, fragment - oldcount, oldcount,
uspi->s_sbbase + tmp, uspi->s_sbbase + tmp,
uspi->s_sbbase + result, &locked_folio->page); uspi->s_sbbase + result, locked_folio);
*err = 0; *err = 0;
write_seqlock(&UFS_I(inode)->meta_lock); write_seqlock(&UFS_I(inode)->meta_lock);
ufs_cpu_to_data_ptr(sb, p, result); ufs_cpu_to_data_ptr(sb, p, result);