fsck.f2fs: Split build_segment_manager() to speed up auto-fix
PATCH 1/1 fsck.f2fs: Split build_segment_manager() to speed up auto-fix
From: Robin Hsu <[email protected]>
Speed up fsck in auto-fix mode by splitting build_segment_manager() into two disjoint parts:
early_build_segment_manager(), and late_build_segment_manager(),
where in some cases (when !need_fsync_data_record(), or cannot find_fsync_inode()), late_build_segment_manager() won't be needed in auto-fix mode. This speeds up a little bit in those cases.
Signed-off-by Robin Hsu <[email protected]>
Signed-off-by Jaegeuk Kim <[email protected]>
--- fsck/f2fs.h | 3 +++ fsck/mount.c | 34 ++++++++++++++++++++++++++++++---- 2 files changed, 33 insertions(+), 4 deletions(-)
fsck/f2fs.h +3 -0
@@ -273,6 +273,9 @@ struct f2fs_sb_info {u32 free_segments;int cp_backuped;/* backup valid checkpoint */ + +/* true if late_build_segment_manger() is called */ +bool seg_manager_done; };static inline struct f2fs_super_block *F2FS_RAW_SUPER (struct f2fs_sb_info *sbi)
fsck/mount.c +30 -4
@@ -2284,7 +2284,7 @@ static int build_sit_entries(struct f2fs_sb_info *sbi)return 0 ; } -static int build_segment_manager (struct f2fs_sb_info *sbi) +static int early_build_segment_manager (struct f2fs_sb_info *sbi) {struct f2fs_super_block *sb =F2FS_RAW_SUPER (sbi);struct f2fs_checkpoint *cp =F2FS_CKPT (sbi);
@@ -2306,7 +2306,7 @@ static int build_segment_manager(struct f2fs_sb_info *sbi) sm_info->main_segments =get_sb (segment_count_main); sm_info->ssa_blkaddr =get_sb (ssa_blkaddr); -if (build_sit_info (sbi) ||build_curseg (sbi) ||build_sit_entries (sbi)) { +if (build_sit_info (sbi) ||build_curseg (sbi)) {free (sm_info);return -ENOMEM ; }
@@ -2314,6 +2314,20 @@ static int build_segment_manager(struct f2fs_sb_info *sbi)return 0 ; } +static int late_build_segment_manager (struct f2fs_sb_info *sbi) +{ +if (sbi->seg_manager_done) +return 1 ;/* this function was already called */ + + sbi->seg_manager_done = true; +if (build_sit_entries (sbi)) { +free (sbi->sm_info); +return -ENOMEM ; + } + +return 0 ; +} +void build_sit_area_bitmap (struct f2fs_sb_info *sbi) {struct f2fs_fsck *fsck =F2FS_FSCK (sbi);
@@ -3387,6 +3401,12 @@ static int record_fsync_data(struct f2fs_sb_info *sbi)if (ret) goto out; + ret =late_build_segment_manager (sbi); +if (ret <0 ) { +ERR_MSG ("late_build_segment_manager failed\n" ); + goto out; + } + ret =traverse_dnodes (sbi, &inode_list); out:destroy_fsync_dnodes (&inode_list);
@@ -3457,8 +3477,8 @@ int f2fs_do_mount(struct f2fs_sb_info *sbi) sbi->last_valid_block_count = sbi->total_valid_block_count; sbi->alloc_valid_block_count =0 ; -if (build_segment_manager (sbi)) { -ERR_MSG ("build_segment_manager failed\n" ); +if (early_build_segment_manager (sbi)) { +ERR_MSG ("early_build_segment_manager failed\n" );return -1 ; }
@@ -3475,6 +3495,12 @@ int f2fs_do_mount(struct f2fs_sb_info *sbi)if (!f2fs_should_proceed (sb,get_cp (ckpt_flags)))return 1 ; + +if (late_build_segment_manager (sbi) <0 ) { +ERR_MSG ("late_build_segment_manager failed\n" ); +return -1 ; + } +if (f2fs_late_init_nid_bitmap (sbi)) {ERR_MSG ("f2fs_late_init_nid_bitmap failed\n" );return -1 ;
Signature · 8 lines
2.27.0.383.g050319c2ae-goog _______________________________________________ Linux-f2fs-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel