On 2017/10/31 15:06, Chao Yu wrote:
On 2017/10/31 9:38, Sheng Yong wrote:Do not set fix_on if it is allowed by user. Signed-off-by: Sheng Yong <[email protected]> --- fsck/main.c | 2 +- fsck/mount.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fsck/main.c b/fsck/main.c index c9411eb..93037e1 100644 --- a/fsck/main.c +++ b/fsck/main.c @@ -429,7 +429,7 @@ static void do_fsck(struct f2fs_sb_info *sbi) c.fix_on = 1; break; } - } else { + } else if (c.preen_mode) {Needs to update below comments?
I think the new condition hits comment 3 ("fsck -p 1 && error is detected, then
bug_on is set fix_on = 1 here, so that fsck can fix errors automatically"). The
condition was missing and the comment seems not that correct before ;)
thanks,
Sheng
/* * we can hit this in 3 situations: * 1. fsck -f, fix_on has already been set to 1 when diff --git a/fsck/mount.c b/fsck/mount.c index 29af3b7..faa9bc8 100644 --- a/fsck/mount.c +++ b/fsck/mount.c @@ -1879,6 +1879,7 @@ void nullify_nat_entry(struct f2fs_sb_info *sbi, u32 nid)memset(&nat_block->entries[entry_off], 0,sizeof(struct f2fs_nat_entry)); + FIX_MSG("Remove nid [0x%x] in NAT\n", nid);How about adding debug message in separated patch? Thanks,ret = dev_write_block(nat_block, block_addr);ASSERT(ret >= 0); @@ -2031,7 +2032,6 @@ void build_nat_area_bitmap(struct f2fs_sb_info *sbi) */ ASSERT_MSG("Invalid nat entry[0]: " "blk_addr[0x%x]\n", ni.blk_addr); - c.fix_on = 1; fsck->chk.valid_nat_entry_cnt--; }.
------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot _______________________________________________ Linux-f2fs-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
