diff options
author | Robin Hsu <robinhsu@google.com> | 2020-07-10 06:54:44 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-10 06:54:44 +0000 |
commit | 06727cadff1dfba9e2aa89689dca906711ff5be0 (patch) | |
tree | 965a63827bed6d5df7fbd1b2db1498d1f22f0ae8 | |
parent | 171fb10bdb5abc4976bad3b5036bc1acf03d4954 (diff) | |
parent | b5cd9469103d6493601ec96e8bb309e42ed1ef03 (diff) | |
download | f2fs-tools-android11-mainline-conscrypt-release.tar.gz |
fsck.f2fs: Split build_segment_manager() to speed up auto-fix am: b5cd946910android-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12android11-mainline-tethering-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-release
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/f2fs-tools/+/12056203
Change-Id: Ia83a00eac5b15d2ad95d33b21533349d94c777e2
-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; |