Skip to content

Commit 4bdc05b

Browse files
Yongpeng Yanggregkh
authored andcommitted
f2fs: refactor f2fs_move_node_folio function
commit 92c2098 upstream. This patch refactor the f2fs_move_node_folio() function. No logical changes. Cc: stable@kernel.org Signed-off-by: Yongpeng Yang <yangyongpeng@xiaomi.com> Reviewed-by: Chao Yu <chao@kernel.org> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 8d269aa commit 4bdc05b

1 file changed

Lines changed: 32 additions & 22 deletions

File tree

fs/f2fs/node.c

Lines changed: 32 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1821,41 +1821,51 @@ static bool __write_node_folio(struct folio *folio, bool atomic, bool *submitted
18211821
return false;
18221822
}
18231823

1824-
int f2fs_move_node_folio(struct folio *node_folio, int gc_type)
1824+
static int f2fs_write_single_node_folio(struct folio *node_folio, int sync_mode,
1825+
bool mark_dirty, enum iostat_type io_type)
18251826
{
18261827
int err = 0;
1828+
struct writeback_control wbc = {
1829+
.sync_mode = WB_SYNC_ALL,
1830+
.nr_to_write = 1,
1831+
};
18271832

1828-
if (gc_type == FG_GC) {
1829-
struct writeback_control wbc = {
1830-
.sync_mode = WB_SYNC_ALL,
1831-
.nr_to_write = 1,
1832-
};
1833+
if (!sync_mode) {
1834+
/* set page dirty and write it */
1835+
if (!folio_test_writeback(node_folio))
1836+
folio_mark_dirty(node_folio);
1837+
goto out_folio;
1838+
}
18331839

1834-
f2fs_folio_wait_writeback(node_folio, NODE, true, true);
1840+
f2fs_folio_wait_writeback(node_folio, NODE, true, true);
18351841

1842+
if (mark_dirty)
18361843
folio_mark_dirty(node_folio);
1844+
else if (!folio_test_dirty(node_folio))
1845+
goto out_folio;
18371846

1838-
if (!folio_clear_dirty_for_io(node_folio)) {
1839-
err = -EAGAIN;
1840-
goto out_page;
1841-
}
1842-
1843-
if (!__write_node_folio(node_folio, false, NULL,
1844-
&wbc, false, FS_GC_NODE_IO, NULL))
1845-
err = -EAGAIN;
1846-
goto release_page;
1847-
} else {
1848-
/* set page dirty and write it */
1849-
if (!folio_test_writeback(node_folio))
1850-
folio_mark_dirty(node_folio);
1847+
if (!folio_clear_dirty_for_io(node_folio)) {
1848+
err = -EAGAIN;
1849+
goto out_folio;
18511850
}
1852-
out_page:
1851+
1852+
if (!__write_node_folio(node_folio, false, NULL,
1853+
&wbc, false, FS_GC_NODE_IO, NULL))
1854+
err = -EAGAIN;
1855+
goto release_folio;
1856+
out_folio:
18531857
folio_unlock(node_folio);
1854-
release_page:
1858+
release_folio:
18551859
f2fs_folio_put(node_folio, false);
18561860
return err;
18571861
}
18581862

1863+
int f2fs_move_node_folio(struct folio *node_folio, int gc_type)
1864+
{
1865+
return f2fs_write_single_node_folio(node_folio, gc_type == FG_GC,
1866+
true, FS_GC_NODE_IO);
1867+
}
1868+
18591869
int f2fs_fsync_node_pages(struct f2fs_sb_info *sbi, struct inode *inode,
18601870
struct writeback_control *wbc, bool atomic,
18611871
unsigned int *seq_id)

0 commit comments

Comments
 (0)