Commit bcf4d2dd authored by Chao Yu's avatar Chao Yu Committed by Jaegeuk Kim
Browse files

f2fs: convert f2fs_do_write_data_page() to use folio 

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>
Signed-off-by: default avatarChao Yu <chao@kernel.org>
Reviewed-by: default avatarLi Zetao <lizetao1@huawei.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 1efc7831

fs/f2fs/data.c

+13 −13
Original line number Diff line number Diff line
@@ -2648,8 +2648,8 @@ static inline bool need_inplace_update(struct f2fs_io_info *fio) 


int f2fs_do_write_data_page(struct f2fs_io_info *fio)

{

	struct page *page = fio->page;

	struct inode *inode = page->mapping->host;

	struct folio *folio = page_folio(fio->page);

	struct inode *inode = folio->mapping->host;

	struct dnode_of_data dn;

	struct node_info ni;

	bool ipu_force = false;
@@ -2658,14 +2658,14 @@ int f2fs_do_write_data_page(struct f2fs_io_info *fio) 


	/* Use COW inode to make dnode_of_data for atomic write */

	atomic_commit = f2fs_is_atomic_file(inode) &&

				page_private_atomic(fio->page);

				page_private_atomic(folio_page(folio, 0));

	if (atomic_commit)

		set_new_dnode(&dn, F2FS_I(inode)->cow_inode, NULL, NULL, 0);

	else

		set_new_dnode(&dn, inode, NULL, NULL, 0);



	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)) {

		if (!f2fs_is_valid_blkaddr(fio->sbi, fio->old_blkaddr,

						DATA_GENERIC_ENHANCE))
@@ -2680,7 +2680,7 @@ int f2fs_do_write_data_page(struct f2fs_io_info *fio) 
	if (fio->need_lock == LOCK_REQ && !f2fs_trylock_op(fio->sbi))

		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)

		goto out;
@@ -2688,8 +2688,8 @@ int f2fs_do_write_data_page(struct f2fs_io_info *fio) 


	/* This page is already truncated */

	if (fio->old_blkaddr == NULL_ADDR) {

		ClearPageUptodate(page);

		clear_page_private_gcing(page);

		folio_clear_uptodate(folio);

		clear_page_private_gcing(folio_page(folio, 0));

		goto out_writepage;

	}

got_it:
@@ -2715,7 +2715,7 @@ int f2fs_do_write_data_page(struct f2fs_io_info *fio) 
		if (err)

			goto out_writepage;



		set_page_writeback(page);

		folio_start_writeback(folio);

		f2fs_put_dnode(&dn);

		if (fio->need_lock == LOCK_REQ)

			f2fs_unlock_op(fio->sbi);
@@ -2723,11 +2723,11 @@ int f2fs_do_write_data_page(struct f2fs_io_info *fio) 
		if (err) {

			if (fscrypt_inode_uses_fs_layer_crypto(inode))

				fscrypt_finalize_bounce_page(&fio->encrypted_page);

			end_page_writeback(page);

			folio_end_writeback(folio);

		} else {

			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;

	}
@@ -2749,17 +2749,17 @@ int f2fs_do_write_data_page(struct f2fs_io_info *fio) 
	if (err)

		goto out_writepage;



	set_page_writeback(page);

	folio_start_writeback(folio);



	if (fio->compr_blocks && fio->old_blkaddr == COMPRESS_ADDR)

		f2fs_i_compr_blocks_update(inode, fio->compr_blocks - 1, false);



	/* LFS mode write path */

	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);

	if (atomic_commit)

		clear_page_private_atomic(page);

		clear_page_private_atomic(folio_page(folio, 0));

out_writepage:

	f2fs_put_dnode(&dn);

out: