diff options
| author | Christoph Hellwig <hch@lst.de> | 2025-05-08 07:14:29 +0200 |
|---|---|---|
| committer | Jaegeuk Kim <jaegeuk@kernel.org> | 2025-05-08 15:22:45 +0000 |
| commit | 402dd9f02ce447e2253953b5f84a2b62fed00889 (patch) | |
| tree | 11d1c215ae588a531d5d4fc9c362e852eadf8eca /fs/f2fs/node.c | |
| parent | f2fs: return bool from __f2fs_write_meta_folio (diff) | |
| download | linux-402dd9f02ce447e2253953b5f84a2b62fed00889.tar.gz linux-402dd9f02ce447e2253953b5f84a2b62fed00889.zip | |
f2fs: remove wbc->for_reclaim handling
Since commits 7ff0104a8052 ("f2fs: Remove f2fs_write_node_page()") and
3b47398d9861 ("f2fs: Remove f2fs_write_meta_page()'), f2fs can't be
called from reclaim context any more. Remove all code keyed of the
wbc->for_reclaim flag, which is now only set for writing out swap or
shmem pages inside the swap code, but never passed to file systems.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Chao Yu <chao@kernel.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Diffstat (limited to 'fs/f2fs/node.c')
| -rw-r--r-- | fs/f2fs/node.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c index 69308523c34e..f6e98c9fac95 100644 --- a/fs/f2fs/node.c +++ b/fs/f2fs/node.c @@ -1699,12 +1699,7 @@ static int __write_node_folio(struct folio *folio, bool atomic, bool *submitted, if (f2fs_get_node_info(sbi, nid, &ni, !do_balance)) goto redirty_out; - if (wbc->for_reclaim) { - if (!f2fs_down_read_trylock(&sbi->node_write)) - goto redirty_out; - } else { - f2fs_down_read(&sbi->node_write); - } + f2fs_down_read(&sbi->node_write); /* This page is already truncated */ if (unlikely(ni.blk_addr == NULL_ADDR)) { @@ -1740,11 +1735,6 @@ static int __write_node_folio(struct folio *folio, bool atomic, bool *submitted, dec_page_count(sbi, F2FS_DIRTY_NODES); f2fs_up_read(&sbi->node_write); - if (wbc->for_reclaim) { - f2fs_submit_merged_write_cond(sbi, NULL, &folio->page, 0, NODE); - submitted = NULL; - } - folio_unlock(folio); if (unlikely(f2fs_cp_error(sbi))) { @@ -1771,7 +1761,6 @@ int f2fs_move_node_folio(struct folio *node_folio, int gc_type) struct writeback_control wbc = { .sync_mode = WB_SYNC_ALL, .nr_to_write = 1, - .for_reclaim = 0, }; f2fs_folio_wait_writeback(node_folio, NODE, true, true); |