Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

f2fs: skip ->writepages for {mete,node}_inode during recovery 



commit 0771fcc71c0c28bf31ac5c2c863b9f0de0fdf00d upstream.

Skip ->writepages in prior to ->writepage for {meta,node}_inode during
recovery, hence unneeded loop in ->writepages can be avoided.

Moreover, check SBI_POR_DOING earlier while writebacking pages.

Signed-off-by: default avatarChao Yu <yuchao0@huawei.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent f2e35503

fs/f2fs/checkpoint.c

+3 −0
Original line number Diff line number Diff line
@@ -270,6 +270,9 @@ static int f2fs_write_meta_pages(struct address_space *mapping, 
	struct f2fs_sb_info *sbi = F2FS_M_SB(mapping);

	long diff, written;



	if (unlikely(is_sbi_flag_set(sbi, SBI_POR_DOING)))

		goto skip_write;



	/* collect a number of dirty meta pages and write together */

	if (wbc->for_kupdate ||

		get_pages(sbi, F2FS_DIRTY_META) < nr_pages_to_skip(sbi, META))

fs/f2fs/data.c

+7 −6
Original line number Diff line number Diff line
@@ -1489,6 +1489,9 @@ static int __write_data_page(struct page *page, bool *submitted, 


	trace_f2fs_writepage(page, DATA);



	if (unlikely(is_sbi_flag_set(sbi, SBI_POR_DOING)))

		goto redirty_out;



	if (page->index < end_index)

		goto write;
@@ -1502,8 +1505,6 @@ static int __write_data_page(struct page *page, bool *submitted, 


	zero_user_segment(page, offset, PAGE_SIZE);

write:

	if (unlikely(is_sbi_flag_set(sbi, SBI_POR_DOING)))

		goto redirty_out;

	if (f2fs_is_drop_cache(inode))

		goto out;

	/* we should not write 0'th page having journal header */
@@ -1751,6 +1752,10 @@ static int f2fs_write_data_pages(struct address_space *mapping, 
	if (!get_dirty_pages(inode) && wbc->sync_mode == WB_SYNC_NONE)

		return 0;



	/* during POR, we don't need to trigger writepage at all. */

	if (unlikely(is_sbi_flag_set(sbi, SBI_POR_DOING)))

		goto skip_write;



	if (S_ISDIR(inode->i_mode) && wbc->sync_mode == WB_SYNC_NONE &&

			get_dirty_pages(inode) < nr_pages_to_skip(sbi, DATA) &&

			available_free_memory(sbi, DIRTY_DENTS))
@@ -1760,10 +1765,6 @@ static int f2fs_write_data_pages(struct address_space *mapping, 
	if (is_inode_flag_set(inode, FI_DO_DEFRAG))

		goto skip_write;



	/* during POR, we don't need to trigger writepage at all. */

	if (unlikely(is_sbi_flag_set(sbi, SBI_POR_DOING)))

		goto skip_write;



	trace_f2fs_writepages(mapping->host, wbc, DATA);



	/* to avoid spliting IOs due to mixed WB_SYNC_ALL and WB_SYNC_NONE */

fs/f2fs/node.c

+3 −0
Original line number Diff line number Diff line
@@ -1696,6 +1696,9 @@ static int f2fs_write_node_pages(struct address_space *mapping, 
	struct blk_plug plug;

	long diff;



	if (unlikely(is_sbi_flag_set(sbi, SBI_POR_DOING)))

		goto skip_write;



	/* balancing f2fs's metadata in background */

	f2fs_balance_fs_bg(sbi);