UPSTREAM: f2fs: skip GC if possible when checkpoint disabling
If the number of unusable blocks is not larger than
unusable capacity, we can skip GC when checkpoint
disabling.
Bug: 283175904
Bug: 291893277
Signed-off-by: Weichao Guo <guoweichao@oppo.com>
Signed-off-by: Chao Yu <chao@kernel.org>
[Jaegeuk Kim: Fix missing gc_mode assignment]
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
(cherry picked from commit 2880f47b949f1f49e2d861ffbba91d57416be7d9)
Signed-off-by: sunshijie <sunshijie@xiaomi.corp-partner.google.com>
Change-Id: I045578835d57640aff765c1a64eedb15ba7b8098
(cherry picked from commit acdef49259f08e39fe87681d1e7b372aa88cb6b3)
diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index 7182a5d..c263e89 100644
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -2110,7 +2110,7 @@
{
unsigned int s_flags = sbi->sb->s_flags;
struct cp_control cpc;
- unsigned int gc_mode;
+ unsigned int gc_mode = sbi->gc_mode;
int err = 0;
int ret;
block_t unusable;
@@ -2121,9 +2121,13 @@
}
sbi->sb->s_flags |= SB_ACTIVE;
+ /* check if we need more GC first */
+ unusable = f2fs_get_unusable_blocks(sbi);
+ if (!f2fs_disable_cp_again(sbi, unusable))
+ goto skip_gc;
+
f2fs_update_time(sbi, DISABLE_TIME);
- gc_mode = sbi->gc_mode;
sbi->gc_mode = GC_URGENT_HIGH;
while (!f2fs_time_over(sbi, DISABLE_TIME)) {
@@ -2149,6 +2153,7 @@
goto restore_flag;
}
+skip_gc:
f2fs_down_write(&sbi->gc_lock);
cpc.reason = CP_PAUSE;
set_sbi_flag(sbi, SBI_CP_DISABLED);
