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 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
This commit is contained in:
committed by
Alistair Delva
parent
2501e448aa
commit
acdef49259
@@ -2110,7 +2110,7 @@ static int f2fs_disable_checkpoint(struct f2fs_sb_info *sbi)
|
||||
{
|
||||
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 @@ static int f2fs_disable_checkpoint(struct f2fs_sb_info *sbi)
|
||||
}
|
||||
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 @@ static int f2fs_disable_checkpoint(struct f2fs_sb_info *sbi)
|
||||
goto restore_flag;
|
||||
}
|
||||
|
||||
skip_gc:
|
||||
f2fs_down_write(&sbi->gc_lock);
|
||||
cpc.reason = CP_PAUSE;
|
||||
set_sbi_flag(sbi, SBI_CP_DISABLED);
|
||||
|
||||
Reference in New Issue
Block a user