Skip to content

Commit 0996648

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 4976d9e commit 0996648

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
@@ -1842,41 +1842,51 @@ static bool __write_node_folio(struct folio *folio, bool atomic, bool *submitted
18421842
return false;
18431843
}
18441844

1845-
int f2fs_move_node_folio(struct folio *node_folio, int gc_type)
1845+
static int f2fs_write_single_node_folio(struct folio *node_folio, int sync_mode,
1846+
bool mark_dirty, enum iostat_type io_type)
18461847
{
18471848
int err = 0;
1849+
struct writeback_control wbc = {
1850+
.sync_mode = WB_SYNC_ALL,
1851+
.nr_to_write = 1,
1852+
};
18481853

1849-
if (gc_type == FG_GC) {
1850-
struct writeback_control wbc = {
1851-
.sync_mode = WB_SYNC_ALL,
1852-
.nr_to_write = 1,
1853-
};
1854+
if (!sync_mode) {
1855+
/* set page dirty and write it */
1856+
if (!folio_test_writeback(node_folio))
1857+
folio_mark_dirty(node_folio);
1858+
goto out_folio;
1859+
}
18541860

1855-
f2fs_folio_wait_writeback(node_folio, NODE, true, true);
1861+
f2fs_folio_wait_writeback(node_folio, NODE, true, true);
18561862

1863+
if (mark_dirty)
18571864
folio_mark_dirty(node_folio);
1865+
else if (!folio_test_dirty(node_folio))
1866+
goto out_folio;
18581867

1859-
if (!folio_clear_dirty_for_io(node_folio)) {
1860-
err = -EAGAIN;
1861-
goto out_page;
1862-
}
1863-
1864-
if (!__write_node_folio(node_folio, false, NULL,
1865-
&wbc, false, FS_GC_NODE_IO, NULL))
1866-
err = -EAGAIN;
1867-
goto release_page;
1868-
} else {
1869-
/* set page dirty and write it */
1870-
if (!folio_test_writeback(node_folio))
1871-
folio_mark_dirty(node_folio);
1868+
if (!folio_clear_dirty_for_io(node_folio)) {
1869+
err = -EAGAIN;
1870+
goto out_folio;
18721871
}
1873-
out_page:
1872+
1873+
if (!__write_node_folio(node_folio, false, NULL,
1874+
&wbc, false, FS_GC_NODE_IO, NULL))
1875+
err = -EAGAIN;
1876+
goto release_folio;
1877+
out_folio:
18741878
folio_unlock(node_folio);
1875-
release_page:
1879+
release_folio:
18761880
f2fs_folio_put(node_folio, false);
18771881
return err;
18781882
}
18791883

1884+
int f2fs_move_node_folio(struct folio *node_folio, int gc_type)
1885+
{
1886+
return f2fs_write_single_node_folio(node_folio, gc_type == FG_GC,
1887+
true, FS_GC_NODE_IO);
1888+
}
1889+
18801890
int f2fs_fsync_node_pages(struct f2fs_sb_info *sbi, struct inode *inode,
18811891
struct writeback_control *wbc, bool atomic,
18821892
unsigned int *seq_id)

0 commit comments

Comments
 (0)