f2fs: clean up w/ get_left_section_blocks()
Chao Yu
maintainerPATCH 1/1 f2fs: clean up w/ get_left_section_blocks()
Introduce get_left_section_blocks() for cleanup, no logic changes.
Signed-off-by Chao Yu <[email protected]>
--- fs/f2fs/segment.h | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-)
fs/f2fs/segment.h +12 -16
@@ -600,6 +600,16 @@ static inline int reserved_sections(struct f2fs_sb_info *sbi)return GET_SEC_FROM_SEG (sbi,reserved_segments (sbi)); } +static inline unsigned int get_left_section_blocks (struct f2fs_sb_info *sbi, +enum log_type type,unsigned int segno) +{ +if (f2fs_lfs_mode (sbi) &&__is_large_section (sbi)) +return CAP_BLKS_PER_SEC (sbi) -SEGS_TO_BLKS (sbi, + (segno -GET_START_SEG_FROM_SEC (sbi, segno))) - +CURSEG_I (sbi, type)->next_blkoff; +return CAP_BLKS_PER_SEC (sbi) -get_ckpt_valid_blocks (sbi, segno, true); +} +static inline bool has_curseg_enough_space (struct f2fs_sb_info *sbi,unsigned int node_blocks,unsigned int data_blocks,unsigned int dent_blocks)
@@ -614,14 +624,7 @@ static inline bool has_curseg_enough_space(struct f2fs_sb_info *sbi,if (unlikely (segno ==NULL_SEGNO ))return false; -if (f2fs_lfs_mode (sbi) &&__is_large_section (sbi)) { - left_blocks =CAP_BLKS_PER_SEC (sbi) - -SEGS_TO_BLKS (sbi, (segno -GET_START_SEG_FROM_SEC (sbi, segno))) - -CURSEG_I (sbi, i)->next_blkoff; - }else { - left_blocks =CAP_BLKS_PER_SEC (sbi) - -get_ckpt_valid_blocks (sbi, segno, true); - } + left_blocks =get_left_section_blocks (sbi, i, segno); blocks = i <=CURSEG_COLD_DATA ? data_blocks : node_blocks;if (blocks > left_blocks)
@@ -634,14 +637,7 @@ static inline bool has_curseg_enough_space(struct f2fs_sb_info *sbi,if (unlikely (segno ==NULL_SEGNO ))return false; -if (f2fs_lfs_mode (sbi) &&__is_large_section (sbi)) { - left_blocks =CAP_BLKS_PER_SEC (sbi) - -SEGS_TO_BLKS (sbi, (segno -GET_START_SEG_FROM_SEC (sbi, segno))) - -CURSEG_I (sbi,CURSEG_HOT_DATA )->next_blkoff; - }else { - left_blocks =CAP_BLKS_PER_SEC (sbi) - -get_ckpt_valid_blocks (sbi, segno, true); - } + left_blocks =get_left_section_blocks (sbi,CURSEG_HOT_DATA , segno);if (dent_blocks + data_blocks > left_blocks)return false;
Signature · 1 line
2.49.0
This patch was applied to jaegeuk/f2fs.git (dev) by Jaegeuk Kim <[email protected]>:
Hello:
This patch was applied to jaegeuk/f2fs.git (dev)
by Jaegeuk Kim <[email protected]>:
Quoted 6 lines · On Mon, 11 Aug 2025 19:41:23 +0800 you wrote:
Introduce
get_left_section_blocks()for cleanup, no logic changes.Signed-off-by Chao Yu <[email protected]>--- fs/f2fs/segment.h | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-)
Here is the summary with links:
- [f2fs-dev] f2fs: clean up w/ get_left_section_blocks()
https://git.kernel.org/jaegeuk/f2fs/c/3ea4ad0a1df0
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html