diff options
| author | Robin Hsu <robinhsu@google.com> | 2020-07-01 16:23:29 +0800 |
|---|---|---|
| committer | Jaegeuk Kim <jaegeuk@kernel.org> | 2020-07-09 18:16:58 -0700 |
| commit | d03cab6c93d634fe746f55302bbcd28a9eb545a7 (patch) | |
| tree | 9e8c2748118c9b47810157d2feb33f5010b97755 | |
| parent | e3c4e1f89a1e279cbb9e818c03ca29bd1425e58d (diff) | |
| download | f2fs-tools-d03cab6c93d634fe746f55302bbcd28a9eb545a7.tar.gz | |
fsck.f2fs: Split build_segment_manager() to speed up auto-fix
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 <robinhsu@google.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
| -rw-r--r-- | fsck/f2fs.h | 3 | ||||
| -rw-r--r-- | fsck/mount.c | 33 |
2 files changed, 32 insertions, 4 deletions
diff --git a/fsck/f2fs.h b/fsck/f2fs.h index 2a00d35..76e8272 100644 --- a/fsck/f2fs.h +++ b/fsck/f2fs.h @@ -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) diff --git a/fsck/mount.c b/fsck/mount.c index d0f2eab..6d467c8 100644 --- a/fsck/mount.c +++ b/fsck/mount.c @@ -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,11 @@ 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; |