MIRRORS/linux-imx
1
0
Fork 0
mirror of https://github.com/nxp-imx/linux-imx.git synced 2025-07-07 09:55:19 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

UPSTREAM: f2fs: convert f2fs_write_inline_data() to use folio

Browse Source 
Convert to use folio, so that we can get rid of 'page->index' to
prepare for removal of 'index' field in structure page [1].

[1] https://lore.kernel.org/all/Zp8fgUSIBGQ1TN0D@casper.infradead.org/

Cc: Matthew Wilcox <willy@infradead.org>
Change-Id: Iea6d2fcc05178972b236aef8d5272f2ef37836d6
Signed-off-by: Chao Yu <chao@kernel.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
(cherry picked from commit b084662139)
This commit is contained in:
Chao Yu 2024-08-13 22:13:26 +08:00 committed by Matthias Männich
parent f2b8a6eca7
commit 8000d9726a
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/f2fs/data.c
View File

@ -2888,7 +2888,7 @@ write:
err = -EAGAIN; err = -EAGAIN;
if (f2fs_has_inline_data(inode)) { if (f2fs_has_inline_data(inode)) {
err = f2fs_write_inline_data(inode, page); err = f2fs_write_inline_data(inode, folio);
if (!err) if (!err)
goto out; goto out;
} }

2
fs/f2fs/f2fs.h
View File

@ -4179,7 +4179,7 @@ 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_page(struct dnode_of_data *dn, struct page *page);
int f2fs_convert_inline_inode(struct inode *inode); int f2fs_convert_inline_inode(struct inode *inode);
int f2fs_try_convert_inline_dir(struct inode *dir, struct dentry *dentry); int f2fs_try_convert_inline_dir(struct inode *dir, struct dentry *dentry);
int f2fs_write_inline_data(struct inode *inode, struct page *page); int f2fs_write_inline_data(struct inode *inode, struct folio *folio);
int f2fs_recover_inline_data(struct inode *inode, struct page *npage); int f2fs_recover_inline_data(struct inode *inode, struct page *npage);
struct f2fs_dir_entry *f2fs_find_in_inline_dir(struct inode *dir, struct f2fs_dir_entry *f2fs_find_in_inline_dir(struct inode *dir,
const struct f2fs_filename *fname, const struct f2fs_filename *fname,

10
fs/f2fs/inline.c
View File

@ -260,7 +260,7 @@ out:
return err; return err;
} }
int f2fs_write_inline_data(struct inode *inode, struct page *page) int f2fs_write_inline_data(struct inode *inode, struct folio *folio)
{ {
struct f2fs_sb_info *sbi = F2FS_I_SB(inode); struct f2fs_sb_info *sbi = F2FS_I_SB(inode);
struct page *ipage; struct page *ipage;
@ -274,14 +274,14 @@ int f2fs_write_inline_data(struct inode *inode, struct page *page)
return -EAGAIN; return -EAGAIN;
} }
f2fs_bug_on(F2FS_I_SB(inode), page->index); f2fs_bug_on(F2FS_I_SB(inode), folio->index);
f2fs_wait_on_page_writeback(ipage, NODE, true, true); f2fs_wait_on_page_writeback(ipage, NODE, true, true);
memcpy_from_page(inline_data_addr(inode, ipage), memcpy_from_folio(inline_data_addr(inode, ipage),
page, 0, MAX_INLINE_DATA(inode)); folio, 0, MAX_INLINE_DATA(inode));
set_page_dirty(ipage); set_page_dirty(ipage);
f2fs_clear_page_cache_dirty_tag(page_folio(page)); f2fs_clear_page_cache_dirty_tag(folio);
set_inode_flag(inode, FI_APPEND_WRITE); set_inode_flag(inode, FI_APPEND_WRITE);
set_inode_flag(inode, FI_DATA_EXIST); set_inode_flag(inode, FI_DATA_EXIST);

2
fs/f2fs/node.c
View File

@ -1535,7 +1535,7 @@ static void flush_inline_data(struct f2fs_sb_info *sbi, nid_t ino)
if (!clear_page_dirty_for_io(page)) if (!clear_page_dirty_for_io(page))
goto page_out; goto page_out;
ret = f2fs_write_inline_data(inode, page); ret = f2fs_write_inline_data(inode, page_folio(page));
inode_dec_dirty_pages(inode); inode_dec_dirty_pages(inode);
f2fs_remove_dirty_inode(inode); f2fs_remove_dirty_inode(inode);
if (ret) if (ret)