Skip to content

Commit

Permalink
f2fs: skip ->writepages for {mete,node}_inode during recovery
Browse files Browse the repository at this point in the history
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: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
  • Loading branch information
Chao Yu authored and Jaegeuk Kim committed Jul 7, 2017
1 parent 6915ea9 commit 0771fcc
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 6 deletions.
3 changes: 3 additions & 0 deletions fs/f2fs/checkpoint.c
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,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))
Expand Down
13 changes: 7 additions & 6 deletions fs/f2fs/data.c
Original file line number Diff line number Diff line change
Expand Up @@ -1492,6 +1492,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;

Expand All @@ -1505,8 +1508,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 */
Expand Down Expand Up @@ -1754,6 +1755,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))
Expand All @@ -1763,10 +1768,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 */
Expand Down
3 changes: 3 additions & 0 deletions fs/f2fs/node.c
Original file line number Diff line number Diff line change
Expand Up @@ -1687,6 +1687,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);

Expand Down

0 comments on commit 0771fcc

Please sign in to comment.