f2fs: fix to recover quota data correctly
Chao Yu
maintainerPATCH 1/1 f2fs: fix to recover quota data correctly
With -O quota mkfs option, xfstests generic/417 fails due to fsck detects data corruption on quota inodes.
[ASSERT] (fsck_chk_quota_files:2051) --> Quota file is missing or invalid quota file content found.
The root cause is there is a hole f2fs doesn't hold quota inodes, so all recovered quota data will be dropped due to SBI_POR_DOING flag was set.
- f2fs_fill_super
- f2fs_recover_orphan_inodes
- f2fs_enable_quota_files
- f2fs_quota_off_umount
<--- quota inodes were dropped --->
- f2fs_recover_fsync_data
- f2fs_enable_quota_files
- f2fs_quota_off_umount
This patch tries to eliminate the hole by holding quota inodes during entire recovery flow as below:
- f2fs_fill_super
- f2fs_recover_quota_begin
- f2fs_recover_orphan_inodes
- f2fs_recover_fsync_data
- f2fs_recover_quota_end
Then, recovered quota data can be persisted after SBI_POR_DOING is cleared.
--- fs/f2fs/checkpoint.c | 23 +----------------- fs/f2fs/debug.c | 1 + fs/f2fs/f2fs.h | 1 + fs/f2fs/recovery.c | 17 +------------ fs/f2fs/super.c | 57 ++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 61 insertions(+), 38 deletions(-)
fs/f2fs/checkpoint.c +1 -22
@@ -703,11 +703,7 @@ static int recover_orphan_inode(struct f2fs_sb_info *sbi, nid_t ino)int f2fs_recover_orphan_inodes (struct f2fs_sb_info *sbi) {block_t start_blk, orphan_blocks, i, j; -unsigned int s_flags = sbi->sb->s_flags;int err =0 ; -#ifdef CONFIG_QUOTA -int quota_enabled; -#endif if (!is_set_ckpt_flags (sbi,CP_ORPHAN_PRESENT_FLAG ))return 0 ;
@@ -717,18 +713,8 @@ int f2fs_recover_orphan_inodes(struct f2fs_sb_info *sbi)return 0 ; } -if (s_flags &SB_RDONLY ) { +if (is_sbi_flag_set (sbi,SBI_IS_WRITABLE ))f2fs_info (sbi,"orphan cleanup on readonly fs" ); - sbi->sb->s_flags &= ~SB_RDONLY ; - } - -#ifdef CONFIG_QUOTA -/* -* Turn on quotas which were not enabled for read-only mounts if -* filesystem has quota feature, so that they are updated correctly. -*/ - quota_enabled =f2fs_enable_quota_files (sbi, s_flags &SB_RDONLY ); -#endif start_blk =__start_cp_addr (sbi) +1 +__cp_payload (sbi); orphan_blocks =__start_sum_addr (sbi) -1 -__cp_payload (sbi);
@@ -762,13 +748,6 @@ int f2fs_recover_orphan_inodes(struct f2fs_sb_info *sbi) out:set_sbi_flag (sbi,SBI_IS_RECOVERED ); -#ifdef CONFIG_QUOTA -/* Turn quotas off */ -if (quota_enabled) -f2fs_quota_off_umount (sbi->sb); -#endif - sbi->sb->s_flags = s_flags;/* Restore SB_RDONLY status */ -return err; }
fs/f2fs/debug.c +1 -0
@@ -352,6 +352,7 @@ static const char *s_flag[MAX_SBI_FLAG] = { [SBI_QUOTA_NEED_REPAIR] = "quota_need_repair", [SBI_IS_RESIZEFS] = "resizefs", [SBI_IS_FREEZING] = "freezefs", + [SBI_IS_WRITABLE] = "writable", };static const char *ipu_mode_names[F2FS_IPU_MAX ] = {
fs/f2fs/f2fs.h +1 -0
@@ -1296,6 +1296,7 @@ enum {SBI_QUOTA_NEED_REPAIR ,/* quota file may be corrupted */ SBI_IS_RESIZEFS ,/* resizefs is in process */ SBI_IS_FREEZING ,/* freezefs is in process */ +SBI_IS_WRITABLE ,/* remove ro mountoption transiently */ MAX_SBI_FLAG, };
fs/f2fs/recovery.c +1 -16
@@ -825,19 +825,9 @@ int f2fs_recover_fsync_data(struct f2fs_sb_info *sbi, bool check_only)unsigned long s_flags = sbi->sb->s_flags;bool need_writecp = false;bool fix_curseg_write_pointer = false; -#ifdef CONFIG_QUOTA -int quota_enabled; -#endif -if (s_flags &SB_RDONLY ) { +if (is_sbi_flag_set (sbi,SBI_IS_WRITABLE ))f2fs_info (sbi,"recover fsync data on readonly fs" ); - sbi->sb->s_flags &= ~SB_RDONLY ; - } - -#ifdef CONFIG_QUOTA -/* Turn on quotas so that they are updated correctly */ - quota_enabled =f2fs_enable_quota_files (sbi, s_flags &SB_RDONLY ); -#endif INIT_LIST_HEAD (&inode_list);INIT_LIST_HEAD (&tmp_inode_list);
@@ -909,11 +899,6 @@ int f2fs_recover_fsync_data(struct f2fs_sb_info *sbi, bool check_only) } } -#ifdef CONFIG_QUOTA -/* Turn quotas off */ -if (quota_enabled) -f2fs_quota_off_umount (sbi->sb); -#endif sbi->sb->s_flags = s_flags;/* Restore SB_RDONLY status */ return ret ? ret : err;
fs/f2fs/super.c +57 -0
81 lines not on this page · raw message
Signature · 1 line
2.36.1
This patch was applied to jaegeuk/f2fs.git (dev) by Jaegeuk Kim <[email protected]>:
Hello:
This patch was applied to jaegeuk/f2fs.git (dev)
by Jaegeuk Kim <[email protected]>:
Quoted 17 lines · On Sun, 2 Apr 2023 19:27:06 +0800 you wrote:
With -O quota mkfs option, xfstests generic/417 fails due to fsck detects data corruption on quota inodes.
[ASSERT] (fsck_chk_quota_files:2051) --> Quota file is missing or invalid quota file content found.
The root cause is there is a hole f2fs doesn't hold quota inodes, so all recovered quota data will be dropped due to
SBI_POR_DOINGflag was set.
-f2fs_fill_super
-f2fs_recover_orphan_inodes
-f2fs_enable_quota_files
-f2fs_quota_off_umount
<--- quota inodes were dropped --->
-f2fs_recover_fsync_data
-f2fs_enable_quota_files
-f2fs_quota_off_umount
Quoted 1 line
[...]
Here is the summary with links:
- [f2fs-dev] f2fs: fix to recover quota data correctly
https://git.kernel.org/jaegeuk/f2fs/c/cbb356d60c54
You are awesome, thank you!
Signature · 10 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html _______________________________________________ Linux-f2fs-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel