diff options
| author | Daeho Jeong <daehojeong@google.com> | 2021-10-27 16:46:10 -0700 |
|---|---|---|
| committer | Jaegeuk Kim <jaegeuk@kernel.org> | 2021-10-29 10:36:13 -0700 |
| commit | ade81b96c9e45b9e72241d732fa36db0cabc1470 (patch) | |
| tree | 8d4c167dda05ad5c39a95bab0b35cece2a3386c5 | |
| parent | 99bc49736baa5e90f4e2cb31caf38e33d6cd055a (diff) | |
| download | f2fs-tools-ade81b96c9e45b9e72241d732fa36db0cabc1470.tar.gz | |
f2fs-tools: remove false failure alarm when fixing quota
Even though fsck fixed quota issues, fsck returns failure status and
makes the user code misunderstand like errors are still there.
Signed-off-by: Daeho Jeong <daehojeong@google.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
| -rw-r--r-- | fsck/fsck.c | 6 | ||||
| -rw-r--r-- | include/f2fs_fs.h | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/fsck/fsck.c b/fsck/fsck.c index 110c1ec..bc11e07 100644 --- a/fsck/fsck.c +++ b/fsck/fsck.c @@ -2025,7 +2025,7 @@ int fsck_chk_quota_files(struct f2fs_sb_info *sbi) f2fs_filesize_update(sbi, ino, 0); ret = quota_write_inode(sbi, qtype); if (!ret) { - c.bug_on = 1; + c.quota_fixed = true; DBG(1, "OK\n"); } else { ASSERT_MSG("Unable to write quota file"); @@ -2197,6 +2197,8 @@ void fsck_init(struct f2fs_sb_info *sbi) ASSERT(fsck->dentry != NULL); memcpy(fsck->dentry->name, "/", 1); fsck->dentry_end = fsck->dentry; + + c.quota_fixed = false; } static void fix_hard_links(struct f2fs_sb_info *sbi) @@ -3330,7 +3332,7 @@ int fsck_verify(struct f2fs_sb_info *sbi) if (force || (c.fix_on && f2fs_dev_is_writable())) { struct f2fs_checkpoint *cp = F2FS_CKPT(sbi); - if (force || c.bug_on || c.bug_nat_bits) { + if (force || c.bug_on || c.bug_nat_bits || c.quota_fixed) { /* flush nats to write_nit_bits below */ flush_journal_entries(sbi); fix_hard_links(sbi); diff --git a/include/f2fs_fs.h b/include/f2fs_fs.h index 69260a6..9f918ba 100644 --- a/include/f2fs_fs.h +++ b/include/f2fs_fs.h @@ -491,6 +491,7 @@ struct f2fs_configuration { int defset; int bug_on; int bug_nat_bits; + bool quota_fixed; int alloc_failed; int auto_fix; int layout; |