f2fs-tools: avoid ambigous checkpoint mirroring
PATCH 1/1 f2fs-tools: avoid ambigous checkpoint mirroring
Signed-off-by Jaegeuk Kim <[email protected]>
--- fsck/fsck.c | 26 ++++++++++++++------------ fsck/fsck.h | 1 - fsck/mount.c | 20 +++++--------------- 3 files changed, 19 insertions(+), 28 deletions(-)
fsck/fsck.c +14 -12
@@ -2171,16 +2171,6 @@ static void fix_checkpoint(struct f2fs_sb_info *sbi)ASSERT (ret >=0 ); } -static void fix_checkpoints (struct f2fs_sb_info *sbi) -{ -/* copy valid checkpoint to its mirror position */ -duplicate_checkpoint (sbi); - -/* repair checkpoint at CP #0 position */ - sbi->cur_cp =1 ; -fix_checkpoint (sbi); -} -#ifdef HAVE_LINUX_BLKZONED_H /*
@@ -3103,6 +3093,12 @@ int fsck_verify(struct f2fs_sb_info *sbi)struct f2fs_checkpoint *cp =F2FS_CKPT (sbi);if (force || c.bug_on || c.bug_nat_bits) { +/* +* copy valid checkpoint to its mirror position and +* fix everything in cp #0. +*/ +duplicate_checkpoint (sbi); +/* flush nats to write_nit_bits below */ flush_journal_entries (sbi);fix_hard_links (sbi);
@@ -3111,10 +3107,16 @@ int fsck_verify(struct f2fs_sb_info *sbi)fix_wp_sit_alignment (sbi);fix_curseg_info (sbi);fix_checksum (sbi); -fix_checkpoints (sbi); +fix_checkpoint (sbi); }else if (is_set_ckpt_flags (cp,CP_FSCK_FLAG ) ||is_set_ckpt_flags (cp,CP_QUOTA_NEED_FSCK_FLAG )) { -write_checkpoints (sbi); + +/* +* copy valid checkpoint to its mirror position and +* fix everything in cp #0. +*/ +duplicate_checkpoint (sbi); +write_checkpoint (sbi); } }return ret;
fsck/fsck.h +0 -1
@@ -203,7 +203,6 @@ extern void write_curseg_info(struct f2fs_sb_info *);extern int find_next_free_block (struct f2fs_sb_info *,u64 *,int ,int ,bool );extern void duplicate_checkpoint (struct f2fs_sb_info *);extern void write_checkpoint (struct f2fs_sb_info *); -extern void write_checkpoints (struct f2fs_sb_info *);extern void update_superblock (struct f2fs_super_block *,int );extern void update_data_blkaddr (struct f2fs_sb_info *,nid_t ,u16 ,block_t );extern void update_nat_blkaddr (struct f2fs_sb_info *,nid_t ,nid_t ,block_t );
fsck/mount.c +5 -15
@@ -2404,11 +2404,8 @@ next:void flush_journal_entries (struct f2fs_sb_info *sbi) { -int n_nats =flush_nat_journal_entries (sbi); -int n_sits =flush_sit_journal_entries (sbi); - -if (n_nats || n_sits) -write_checkpoints (sbi); +flush_nat_journal_entries (sbi); +flush_sit_journal_entries (sbi); }void flush_sit_entries (struct f2fs_sb_info *sbi)
@@ -2777,6 +2774,9 @@ void duplicate_checkpoint(struct f2fs_sb_info *sbi) sbi->cp_backuped =1 ; +/* repair checkpoint at CP #0 position */ + sbi->cur_cp =1 ; +MSG (0 ,"Info: Duplicate valid checkpoint to mirror position " "%llu -> %llu\n" , src, dst); }
@@ -2870,16 +2870,6 @@ void write_checkpoint(struct f2fs_sb_info *sbi)ASSERT (ret >=0 ); } -void write_checkpoints (struct f2fs_sb_info *sbi) -{ -/* copy valid checkpoint to its mirror position */ -duplicate_checkpoint (sbi); - -/* repair checkpoint at CP #0 position */ - sbi->cur_cp =1 ; -write_checkpoint (sbi); -} -void build_nat_area_bitmap (struct f2fs_sb_info *sbi) {struct curseg_info *curseg =CURSEG_I (sbi,CURSEG_HOT_DATA );
Signature · 8 lines
2.24.0.525.g8f36a354ae-goog _______________________________________________ Linux-f2fs-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
Jaegeuk,
Any commit message? A little bit hard to just review on changed codes.
Quoted 108 lines · Jaegeuk Kim
Signed-off-by Jaegeuk Kim <[email protected]>--- fsck/fsck.c | 26 ++++++++++++++------------ fsck/fsck.h | 1 - fsck/mount.c | 20 +++++--------------- 3 files changed, 19 insertions(+), 28 deletions(-)fsck/fsck.c +14
-12@@ -2171,16 +2171,6 @@ static void fix_checkpoint(struct f2fs_sb_info *sbi)ASSERT (ret >=0 ); } -static void fix_checkpoints (struct f2fs_sb_info *sbi) -{ -/* copy valid checkpoint to its mirror position */ -duplicate_checkpoint (sbi); - -/* repair checkpoint at CP #0 position */ - sbi->cur_cp =1 ; -fix_checkpoint (sbi); -} -#ifdef HAVE_LINUX_BLKZONED_H /* @@ -3103,6 +3093,12 @@ int fsck_verify(struct f2fs_sb_info *sbi)struct f2fs_checkpoint *cp =F2FS_CKPT (sbi);if (force || c.bug_on || c.bug_nat_bits) { +/* +* copy valid checkpoint to its mirror position and +* fix everything in cp #0. +*/ +duplicate_checkpoint (sbi); +/* flush nats to write_nit_bits below */ flush_journal_entries (sbi);fix_hard_links (sbi);@@ -3111,10 +3107,16 @@ int fsck_verify(struct f2fs_sb_info *sbi)fix_wp_sit_alignment (sbi);fix_curseg_info (sbi);fix_checksum (sbi); -fix_checkpoints (sbi); +fix_checkpoint (sbi); }else if (is_set_ckpt_flags (cp,CP_FSCK_FLAG ) ||is_set_ckpt_flags (cp,CP_QUOTA_NEED_FSCK_FLAG )) { -write_checkpoints (sbi); + +/* +* copy valid checkpoint to its mirror position and +* fix everything in cp #0. +*/ +duplicate_checkpoint (sbi); +write_checkpoint (sbi); } }return ret;fsck/fsck.h +0
-1@@ -203,7 +203,6 @@ extern void write_curseg_info(struct f2fs_sb_info *);extern int find_next_free_block (struct f2fs_sb_info *,u64 *,int ,int ,bool );extern void duplicate_checkpoint (struct f2fs_sb_info *);extern void write_checkpoint (struct f2fs_sb_info *); -extern void write_checkpoints (struct f2fs_sb_info *);extern void update_superblock (struct f2fs_super_block *,int );extern void update_data_blkaddr (struct f2fs_sb_info *,nid_t ,u16 ,block_t );extern void update_nat_blkaddr (struct f2fs_sb_info *,nid_t ,nid_t ,block_t );fsck/mount.c +5
-8@@ -2404,11 +2404,8 @@ next:void flush_journal_entries (struct f2fs_sb_info *sbi) { -int n_nats =flush_nat_journal_entries (sbi); -int n_sits =flush_sit_journal_entries (sbi); - -if (n_nats || n_sits) -write_checkpoints (sbi); +flush_nat_journal_entries (sbi); +flush_sit_journal_entries (sbi); }void flush_sit_entries (struct f2fs_sb_info *sbi)@@ -2777,6 +2774,9 @@ void duplicate_checkpoint(struct f2fs_sb_info *sbi) sbi->cp_backuped =1 ; +/* repair checkpoint at CP #0 position */ + sbi->cur_cp =1 ; +MSG (0 ,"Info: Duplicate valid checkpoint to mirror position " "%llu -> %llu\n" , src, dst); }@@ -2870,16 +2870,6 @@ void write_checkpoint(struct f2fs_sb_info *sbi)ASSERT (ret >=0 ); } -void write_checkpoints (struct f2fs_sb_info *sbi) -{ -/* copy valid checkpoint to its mirror position */
fsck/mount.c void write_checkpoint(struct f2fs_sb_info *sbi) · line 2875
Quoted 10 lines
fsck/mount.c +0
-7-duplicate_checkpoint (sbi); - -/* repair checkpoint at CP #0 position */ - sbi->cur_cp =1 ; -write_checkpoint (sbi); -} -void build_nat_area_bitmap (struct f2fs_sb_info *sbi) {struct curseg_info *curseg =CURSEG_I (sbi,CURSEG_HOT_DATA );
_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
Quoted 4 lines · Chao Yu
Jaegeuk,
Any commit message? A little bit hard to just review on changed codes.
I dropped this patch due to causing subtle inconsistency problem. Not sure why tho.
Quoted 106 lines · Jaegeuk Kim
Quoted 104 lines
Signed-off-by Jaegeuk Kim <[email protected]>--- fsck/fsck.c | 26 ++++++++++++++------------ fsck/fsck.h | 1 - fsck/mount.c | 20 +++++--------------- 3 files changed, 19 insertions(+), 28 deletions(-)fsck/fsck.c +14
-12@@ -2171,16 +2171,6 @@ static void fix_checkpoint(struct f2fs_sb_info *sbi)ASSERT (ret >=0 ); } -static void fix_checkpoints (struct f2fs_sb_info *sbi) -{ -/* copy valid checkpoint to its mirror position */ -duplicate_checkpoint (sbi); - -/* repair checkpoint at CP #0 position */ - sbi->cur_cp =1 ; -fix_checkpoint (sbi); -} -#ifdef HAVE_LINUX_BLKZONED_H /* @@ -3103,6 +3093,12 @@ int fsck_verify(struct f2fs_sb_info *sbi)struct f2fs_checkpoint *cp =F2FS_CKPT (sbi);if (force || c.bug_on || c.bug_nat_bits) { +/* +* copy valid checkpoint to its mirror position and +* fix everything in cp #0. +*/ +duplicate_checkpoint (sbi); +/* flush nats to write_nit_bits below */ flush_journal_entries (sbi);fix_hard_links (sbi);@@ -3111,10 +3107,16 @@ int fsck_verify(struct f2fs_sb_info *sbi)fix_wp_sit_alignment (sbi);fix_curseg_info (sbi);fix_checksum (sbi); -fix_checkpoints (sbi); +fix_checkpoint (sbi); }else if (is_set_ckpt_flags (cp,CP_FSCK_FLAG ) ||is_set_ckpt_flags (cp,CP_QUOTA_NEED_FSCK_FLAG )) { -write_checkpoints (sbi); + +/* +* copy valid checkpoint to its mirror position and +* fix everything in cp #0. +*/ +duplicate_checkpoint (sbi); +write_checkpoint (sbi); } }return ret;fsck/fsck.h +0
-1@@ -203,7 +203,6 @@ extern void write_curseg_info(struct f2fs_sb_info *);extern int find_next_free_block (struct f2fs_sb_info *,u64 *,int ,int ,bool );extern void duplicate_checkpoint (struct f2fs_sb_info *);extern void write_checkpoint (struct f2fs_sb_info *); -extern void write_checkpoints (struct f2fs_sb_info *);extern void update_superblock (struct f2fs_super_block *,int );extern void update_data_blkaddr (struct f2fs_sb_info *,nid_t ,u16 ,block_t );extern void update_nat_blkaddr (struct f2fs_sb_info *,nid_t ,nid_t ,block_t );fsck/mount.c +5
-5@@ -2404,11 +2404,8 @@ next:void flush_journal_entries (struct f2fs_sb_info *sbi) { -int n_nats =flush_nat_journal_entries (sbi); -int n_sits =flush_sit_journal_entries (sbi); - -if (n_nats || n_sits) -write_checkpoints (sbi); +flush_nat_journal_entries (sbi); +flush_sit_journal_entries (sbi); }void flush_sit_entries (struct f2fs_sb_info *sbi)@@ -2777,6 +2774,9 @@ void duplicate_checkpoint(struct f2fs_sb_info *sbi) sbi->cp_backuped =1 ; +/* repair checkpoint at CP #0 position */ + sbi->cur_cp =1 ; +MSG (0 ,"Info: Duplicate valid checkpoint to mirror position " "%llu -> %llu\n" , src, dst); }@@ -2870,16 +2870,6 @@ void write_checkpoint(struct f2fs_sb_info *sbi)ASSERT (ret >=0 ); }
Quoted 14 lines
Quoted 4 lines
fsck/mount.c +0
-3-void write_checkpoints (struct f2fs_sb_info *sbi) -{ -/* copy valid checkpoint to its mirror position */ fsck/mount.c void write_checkpoint(struct f2fs_sb_info *sbi) · line 2875
Quoted 10 lines
fsck/mount.c +0
-7-duplicate_checkpoint (sbi); - -/* repair checkpoint at CP #0 position */ - sbi->cur_cp =1 ; -write_checkpoint (sbi); -} -void build_nat_area_bitmap (struct f2fs_sb_info *sbi) {struct curseg_info *curseg =CURSEG_I (sbi,CURSEG_HOT_DATA );
_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel