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

UPSTREAM: f2fs: convert f2fs_do_write_data_page() 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: Idc67901558ed54059b783cef06d091243ab9013c
Signed-off-by: Chao Yu <chao@kernel.org>
Reviewed-by: Li Zetao <lizetao1@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
(cherry picked from commit bcf4d2dd84)
This commit is contained in:
Chao Yu 2024-08-20 22:55:03 +08:00 committed by Matthias Männich
parent 1d834ca736
commit 80064f1aea
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
fs/f2fs/data.c
View File

@ -2670,8 +2670,8 @@ static inline bool need_inplace_update(struct f2fs_io_info *fio)
int f2fs_do_write_data_page(struct f2fs_io_info *fio) int f2fs_do_write_data_page(struct f2fs_io_info *fio)
{ {
struct page *page = fio->page; struct folio *folio = page_folio(fio->page);
struct inode *inode = page->mapping->host; struct inode *inode = folio->mapping->host;
struct dnode_of_data dn; struct dnode_of_data dn;
struct node_info ni; struct node_info ni;
bool ipu_force = false; bool ipu_force = false;
@ -2680,14 +2680,14 @@ int f2fs_do_write_data_page(struct f2fs_io_info *fio)
/* Use COW inode to make dnode_of_data for atomic write */ /* Use COW inode to make dnode_of_data for atomic write */
atomic_commit = f2fs_is_atomic_file(inode) && atomic_commit = f2fs_is_atomic_file(inode) &&
page_private_atomic(fio->page); page_private_atomic(folio_page(folio, 0));
if (atomic_commit) if (atomic_commit)
set_new_dnode(&dn, F2FS_I(inode)->cow_inode, NULL, NULL, 0); set_new_dnode(&dn, F2FS_I(inode)->cow_inode, NULL, NULL, 0);
else else
set_new_dnode(&dn, inode, NULL, NULL, 0); set_new_dnode(&dn, inode, NULL, NULL, 0);
if (need_inplace_update(fio) && if (need_inplace_update(fio) &&
f2fs_lookup_read_extent_cache_block(inode, page->index, f2fs_lookup_read_extent_cache_block(inode, folio->index,
&fio->old_blkaddr)) { &fio->old_blkaddr)) {
if (!f2fs_is_valid_blkaddr(fio->sbi, fio->old_blkaddr, if (!f2fs_is_valid_blkaddr(fio->sbi, fio->old_blkaddr,
DATA_GENERIC_ENHANCE)) DATA_GENERIC_ENHANCE))
@ -2702,7 +2702,7 @@ int f2fs_do_write_data_page(struct f2fs_io_info *fio)
if (fio->need_lock == LOCK_REQ && !f2fs_trylock_op(fio->sbi)) if (fio->need_lock == LOCK_REQ && !f2fs_trylock_op(fio->sbi))
return -EAGAIN; return -EAGAIN;
err = f2fs_get_dnode_of_data(&dn, page->index, LOOKUP_NODE); err = f2fs_get_dnode_of_data(&dn, folio->index, LOOKUP_NODE);
if (err) if (err)
goto out; goto out;
@ -2710,8 +2710,8 @@ int f2fs_do_write_data_page(struct f2fs_io_info *fio)
/* This page is already truncated */ /* This page is already truncated */
if (fio->old_blkaddr == NULL_ADDR) { if (fio->old_blkaddr == NULL_ADDR) {
ClearPageUptodate(page); folio_clear_uptodate(folio);
clear_page_private_gcing(page); clear_page_private_gcing(folio_page(folio, 0));
goto out_writepage; goto out_writepage;
} }
got_it: got_it:
@ -2737,7 +2737,7 @@ got_it:
if (err) if (err)
goto out_writepage; goto out_writepage;
set_page_writeback(page); folio_start_writeback(folio);
f2fs_put_dnode(&dn); f2fs_put_dnode(&dn);
if (fio->need_lock == LOCK_REQ) if (fio->need_lock == LOCK_REQ)
f2fs_unlock_op(fio->sbi); f2fs_unlock_op(fio->sbi);
@ -2745,11 +2745,11 @@ got_it:
if (err) { if (err) {
if (fscrypt_inode_uses_fs_layer_crypto(inode)) if (fscrypt_inode_uses_fs_layer_crypto(inode))
fscrypt_finalize_bounce_page(&fio->encrypted_page); fscrypt_finalize_bounce_page(&fio->encrypted_page);
end_page_writeback(page); folio_end_writeback(folio);
} else { } else {
set_inode_flag(inode, FI_UPDATE_WRITE); set_inode_flag(inode, FI_UPDATE_WRITE);
} }
trace_f2fs_do_write_data_page(page_folio(page), IPU); trace_f2fs_do_write_data_page(folio, IPU);
return err; return err;
} }
@ -2771,17 +2771,17 @@ got_it:
if (err) if (err)
goto out_writepage; goto out_writepage;
set_page_writeback(page); folio_start_writeback(folio);
if (fio->compr_blocks && fio->old_blkaddr == COMPRESS_ADDR) if (fio->compr_blocks && fio->old_blkaddr == COMPRESS_ADDR)
f2fs_i_compr_blocks_update(inode, fio->compr_blocks - 1, false); f2fs_i_compr_blocks_update(inode, fio->compr_blocks - 1, false);
/* LFS mode write path */ /* LFS mode write path */
f2fs_outplace_write_data(&dn, fio); f2fs_outplace_write_data(&dn, fio);
trace_f2fs_do_write_data_page(page_folio(page), OPU); trace_f2fs_do_write_data_page(folio, OPU);
set_inode_flag(inode, FI_APPEND_WRITE); set_inode_flag(inode, FI_APPEND_WRITE);
if (atomic_commit) if (atomic_commit)
clear_page_private_atomic(page); clear_page_private_atomic(folio_page(folio, 0));
out_writepage: out_writepage:
f2fs_put_dnode(&dn); f2fs_put_dnode(&dn);
out: out: