f2fs: adjust unusable cap before checkpoint=disable mode

Daeho Jeong · Jaegeuk Kim · commit a35749b1ed64 · 2024-11-21T16:12:30.000Z
The unusable cap value must be adjusted before checking whether
checkpoint=disable is feasible.

Signed-off-by: Daeho Jeong &lt;daehojeong@google.com&gt;
Reviewed-by: Chao Yu &lt;chao@kernel.org&gt;
Signed-off-by: Jaegeuk Kim &lt;jaegeuk@kernel.org&gt;
diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
@@ -2496,6 +2496,7 @@ static int f2fs_remount(struct super_block *sb, int *flags, char *data)
 		}
 	}
 
+	adjust_unusable_cap_perc(sbi);
 	if (enable_checkpoint == !!test_opt(sbi, DISABLE_CHECKPOINT)) {
 		if (test_opt(sbi, DISABLE_CHECKPOINT)) {
 			err = f2fs_disable_checkpoint(sbi);
@@ -2540,7 +2541,6 @@ static int f2fs_remount(struct super_block *sb, int *flags, char *data)
 		(test_opt(sbi, POSIX_ACL) ? SB_POSIXACL : 0);
 
 	limit_reserve_root(sbi);
-	adjust_unusable_cap_perc(sbi);
 	*flags = (*flags & ~SB_LAZYTIME) | (sb->s_flags & SB_LAZYTIME);
 	return 0;
 restore_checkpoint:

Original file line number	Diff line number	Diff line change
`@@ -2496,6 +2496,7 @@ static int f2fs_remount(struct super_block sb, int flags, char *data)`
`2496`	`2496`	`}`
`2497`	`2497`	`}`
`2498`	`2498`
	`2499`	`+ adjust_unusable_cap_perc(sbi);`
`2499`	`2500`	`if (enable_checkpoint == !!test_opt(sbi, DISABLE_CHECKPOINT)) {`
`2500`	`2501`	`if (test_opt(sbi, DISABLE_CHECKPOINT)) {`
`2501`	`2502`	`err = f2fs_disable_checkpoint(sbi);`
`@@ -2540,7 +2541,6 @@ static int f2fs_remount(struct super_block sb, int flags, char *data)`
`2540`	`2541`	`(test_opt(sbi, POSIX_ACL) ? SB_POSIXACL : 0);`
`2541`	`2542`
`2542`	`2543`	`limit_reserve_root(sbi);`
`2543`		`- adjust_unusable_cap_perc(sbi);`
`2544`	`2544`	`flags = (flags & ~SB_LAZYTIME) \| (sb->s_flags & SB_LAZYTIME);`
`2545`	`2545`	`return 0;`
`2546`	`2546`	`restore_checkpoint:`