f2fs: fix to convert log type to segment data type correctly
Chao Yu
maintainerPATCH v2 1/1 f2fs: fix to convert log type to segment data type correctly
This patch introduces a new helper log_type_to_seg_type() to convert log type to segment data type, and uses it to clean up opened codes in build_curseg(), and also it fixes to convert log type before use in do_write_page().
---
v2:
- no logic change, just rebase to last dev-test branch
fs/f2fs/segment.c | 36 ++++++++++++++++++++++++++++-------- 1 file changed, 28 insertions(+), 8 deletions(-)
fs/f2fs/segment.c +28 -8
@@ -3833,10 +3833,35 @@ void f2fs_update_device_state(struct f2fs_sb_info *sbi, nid_t ino, } } +static int log_type_to_seg_type (enum log_type type) +{ +int seg_type =CURSEG_COLD_DATA ; + +switch (type) { +case CURSEG_HOT_DATA : +case CURSEG_WARM_DATA : +case CURSEG_COLD_DATA : +case CURSEG_HOT_NODE : +case CURSEG_WARM_NODE : +case CURSEG_COLD_NODE : + seg_type = (int )type; +break ; +case CURSEG_COLD_DATA_PINNED : +case CURSEG_ALL_DATA_ATGC : + seg_type =CURSEG_COLD_DATA ; +break ; +default : +break ; + } +return seg_type; +} +static void do_write_page (struct f2fs_summary *sum,struct f2fs_io_info *fio) { -int type =__get_segment_type (fio); -bool keep_order = (f2fs_lfs_mode (fio->sbi) && type ==CURSEG_COLD_DATA ); +enum log_type type =__get_segment_type (fio); +int seg_type =log_type_to_seg_type (type); +bool keep_order = (f2fs_lfs_mode (fio->sbi) && + seg_type ==CURSEG_COLD_DATA );if (keep_order)f2fs_down_read (&fio->sbi->io_order_lock);
@@ -4818,12 +4843,7 @@ static int build_curseg(struct f2fs_sb_info *sbi) sizeof(struct f2fs_journal), GFP_KERNEL);if (!array[i].journal)return -ENOMEM ; -if (i <NR_PERSISTENT_LOG ) - array[i].seg_type =CURSEG_HOT_DATA + i; -else if (i ==CURSEG_COLD_DATA_PINNED ) - array[i].seg_type =CURSEG_COLD_DATA ; -else if (i ==CURSEG_ALL_DATA_ATGC ) - array[i].seg_type =CURSEG_COLD_DATA ; + array[i].seg_type =log_type_to_seg_type (i);reset_curseg_fields (&array[i]); }return restore_curseg_summaries (sbi);
Signature · 1 line
2.40.1
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 8 lines · On Wed, 30 Oct 2024 16:17:01 +0800 you wrote:
This patch introduces a new helper
log_type_to_seg_type()to convert log type to segment data type, and uses it to clean up opened codes inbuild_curseg(), and also it fixes to convert log type before use indo_write_page().Signed-off-by Chao Yu <[email protected]>[...]
Here is the summary with links:
- [f2fs-dev,v2] f2fs: fix to convert log type to segment data type correctly
https://git.kernel.org/jaegeuk/f2fs/c/51d3d952c508
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html