diff options
| author | Daeho Jeong <daehojeong@google.com> | 2023-10-27 08:49:35 -0700 |
|---|---|---|
| committer | Jaegeuk Kim <jaegeuk@kernel.org> | 2023-10-27 15:46:46 -0700 |
| commit | 8395c42a9a709117ff74938e7d6ddfe04165c610 (patch) | |
| tree | 65fd0e165d2e84e6003903221f807ff5309cc233 | |
| parent | 96f809cf4ebdb9b4094d9873e9c3330e7e1e2acc (diff) | |
| download | f2fs-tools-8395c42a9a709117ff74938e7d6ddfe04165c610.tar.gz | |
f2fs-tools: do not put CP_UMOUNT_FLAG for roll forward recovery
If we write CP_UMOUNT_FLAG in fsck, f2fs will not do foll forward recovery
even though it has to do.
Signed-off-by: Daeho Jeong <daehojeong@google.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
| -rw-r--r-- | fsck/fsck.c | 3 | ||||
| -rw-r--r-- | fsck/mount.c | 5 | ||||
| -rw-r--r-- | include/f2fs_fs.h | 1 |
3 files changed, 7 insertions, 2 deletions
diff --git a/fsck/fsck.c b/fsck/fsck.c index 65fe12d..4297616 100644 --- a/fsck/fsck.c +++ b/fsck/fsck.c @@ -2526,7 +2526,8 @@ static void fix_checkpoint(struct f2fs_sb_info *sbi) struct f2fs_super_block *sb = F2FS_RAW_SUPER(sbi); struct f2fs_checkpoint *cp = F2FS_CKPT(sbi); unsigned long long cp_blk_no; - u32 flags = c.alloc_failed ? CP_FSCK_FLAG: CP_UMOUNT_FLAG; + u32 flags = c.alloc_failed ? CP_FSCK_FLAG : + (c.roll_forward ? 0 : CP_UMOUNT_FLAG); block_t orphan_blks = 0; block_t cp_blocks; u32 i; diff --git a/fsck/mount.c b/fsck/mount.c index 3b02d73..805671c 100644 --- a/fsck/mount.c +++ b/fsck/mount.c @@ -3218,7 +3218,7 @@ void write_checkpoint(struct f2fs_sb_info *sbi) struct f2fs_super_block *sb = F2FS_RAW_SUPER(sbi); block_t orphan_blks = 0; unsigned long long cp_blk_no; - u32 flags = CP_UMOUNT_FLAG; + u32 flags = c.roll_forward ? 0 : CP_UMOUNT_FLAG; int i, ret; uint32_t crc = 0; @@ -3837,6 +3837,9 @@ static int record_fsync_data(struct f2fs_sb_info *sbi) if (ret) goto out; + if (c.func == FSCK && inode_list.next != &inode_list) + c.roll_forward = 1; + ret = late_build_segment_manager(sbi); if (ret < 0) { ERR_MSG("late_build_segment_manager failed\n"); diff --git a/include/f2fs_fs.h b/include/f2fs_fs.h index 725e072..6df2e73 100644 --- a/include/f2fs_fs.h +++ b/include/f2fs_fs.h @@ -1513,6 +1513,7 @@ struct f2fs_configuration { unsigned int feature; /* defined features */ unsigned int quota_bits; /* quota bits */ time_t fixed_time; + int roll_forward; /* mkfs parameters */ int fake_seed; |