github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-23 14:42:08 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

f2fs: Convert f2fs_convert_inline_page() to f2fs_convert_inline_folio()

Browse Source 
Both callers have a folio, so pass it in.  Removes seven calls to
compound_head().

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: Chao Yu <chao@kernel.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
This commit is contained in:
Matthew Wilcox (Oracle) 2025-03-31 21:11:56 +01:00 committed by Jaegeuk Kim
parent 214235c224
commit 6023048cf6
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/f2fs/data.c
View File

@ -3394,7 +3394,7 @@ static int prepare_write_begin(struct f2fs_sb_info *sbi,
set_page_private_inline(&ifolio->page);
goto out;
}
err = f2fs_convert_inline_page(&dn, folio_page(folio, 0));
err = f2fs_convert_inline_folio(&dn, folio);
if (err || dn.data_blkaddr != NULL_ADDR)
goto out;
}

4
fs/f2fs/f2fs.h
View File

@ -3365,7 +3365,7 @@ static inline int inline_xattr_size(struct inode *inode)
/*
* Notice: check inline_data flag without inode page lock is unsafe.
* It could change at any time by f2fs_convert_inline_page().
* It could change at any time by f2fs_convert_inline_folio().
*/
static inline int f2fs_has_inline_data(struct inode *inode)
{
@ -4293,7 +4293,7 @@ void f2fs_do_read_inline_data(struct folio *folio, struct page *ipage);
void f2fs_truncate_inline_inode(struct inode *inode,
struct page *ipage, u64 from);
int f2fs_read_inline_data(struct inode *inode, struct folio *folio);
int f2fs_convert_inline_page(struct dnode_of_data *dn, struct page *page);
int f2fs_convert_inline_folio(struct dnode_of_data *dn, struct folio *folio);
int f2fs_convert_inline_inode(struct inode *inode);
int f2fs_try_convert_inline_dir(struct inode *dir, struct dentry *dentry);
int f2fs_write_inline_data(struct inode *inode, struct folio *folio);

18
fs/f2fs/inline.c
View File

@ -142,7 +142,7 @@ int f2fs_read_inline_data(struct inode *inode, struct folio *folio)
return 0;
}
int f2fs_convert_inline_page(struct dnode_of_data *dn, struct page *page)
int f2fs_convert_inline_folio(struct dnode_of_data *dn, struct folio *folio)
{
struct f2fs_io_info fio = {
.sbi = F2FS_I_SB(dn->inode),
@ -150,7 +150,7 @@ int f2fs_convert_inline_page(struct dnode_of_data *dn, struct page *page)
.type = DATA,
.op = REQ_OP_WRITE,
.op_flags = REQ_SYNC | REQ_PRIO,
.page = page,
.page = &folio->page,
.encrypted_page = NULL,
.io_type = FS_DATA_IO,
};
@ -182,20 +182,20 @@ int f2fs_convert_inline_page(struct dnode_of_data *dn, struct page *page)
return -EFSCORRUPTED;
}
f2fs_bug_on(F2FS_P_SB(page), folio_test_writeback(page_folio(page)));
f2fs_bug_on(F2FS_F_SB(folio), folio_test_writeback(folio));
f2fs_do_read_inline_data(page_folio(page), dn->inode_page);
set_page_dirty(page);
f2fs_do_read_inline_data(folio, dn->inode_page);
folio_mark_dirty(folio);
/* clear dirty state */
dirty = clear_page_dirty_for_io(page);
dirty = folio_clear_dirty_for_io(folio);
/* write data page to try to make data consistent */
set_page_writeback(page);
folio_start_writeback(folio);
fio.old_blkaddr = dn->data_blkaddr;
set_inode_flag(dn->inode, FI_HOT_DATA);
f2fs_outplace_write_data(dn, &fio);
f2fs_wait_on_page_writeback(page, DATA, true, true);
f2fs_folio_wait_writeback(folio, DATA, true, true);
if (dirty) {
inode_dec_dirty_pages(dn->inode);
f2fs_remove_dirty_inode(dn->inode);
@ -246,7 +246,7 @@ int f2fs_convert_inline_inode(struct inode *inode)
set_new_dnode(&dn, inode, ifolio, ifolio, 0);
if (f2fs_has_inline_data(inode))
err = f2fs_convert_inline_page(&dn, &folio->page);
err = f2fs_convert_inline_folio(&dn, folio);
f2fs_put_dnode(&dn);
out: