xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

f2fs: fix error path of f2fs_remount()

Browse Source 
In error path of f2fs_remount(), it missed to restart/stop kernel thread
or enable/disable checkpoint, then mount option status may not be
consistent with real condition of filesystem, so let's reorder remount
flow a bit as below and do recovery correctly in error path:

1) handle gc thread
2) handle ckpt thread
3) handle flush thread
4) handle checkpoint disabling

Signed-off-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
This commit is contained in:
Chao Yu
2021-03-17 17:56:04 +08:00
committed by Jaegeuk Kim
parent fcbab6e80b
commit c4346bbb51
1 changed files with 34 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
fs/f2fs/super.c
View File

@@ -1930,8 +1930,9 @@ static int f2fs_remount(struct super_block *sb, int *flags, char *data)
struct f2fs_mount_info org_mount_opt; struct f2fs_mount_info org_mount_opt;
unsigned long old_sb_flags; unsigned long old_sb_flags;
int err; int err;
bool need_restart_gc = false; bool need_restart_gc = false, need_stop_gc = false;
bool need_stop_gc = false; bool need_restart_ckpt = false, need_stop_ckpt = false;
bool need_restart_flush = false, need_stop_flush = false;
bool no_extent_cache = !test_opt(sbi, EXTENT_CACHE); bool no_extent_cache = !test_opt(sbi, EXTENT_CACHE);
bool disable_checkpoint = test_opt(sbi, DISABLE_CHECKPOINT); bool disable_checkpoint = test_opt(sbi, DISABLE_CHECKPOINT);
bool no_io_align = !F2FS_IO_ALIGNED(sbi); bool no_io_align = !F2FS_IO_ALIGNED(sbi);
@@ -2062,19 +2063,10 @@ static int f2fs_remount(struct super_block *sb, int *flags, char *data)
clear_sbi_flag(sbi, SBI_IS_CLOSE); clear_sbi_flag(sbi, SBI_IS_CLOSE);
} }
if (checkpoint_changed) {
if (test_opt(sbi, DISABLE_CHECKPOINT)) {
err = f2fs_disable_checkpoint(sbi);
if (err)
goto restore_gc;
} else {
f2fs_enable_checkpoint(sbi);
}
}
if ((*flags & SB_RDONLY) || test_opt(sbi, DISABLE_CHECKPOINT) || if ((*flags & SB_RDONLY) || test_opt(sbi, DISABLE_CHECKPOINT) ||
!test_opt(sbi, MERGE_CHECKPOINT)) { !test_opt(sbi, MERGE_CHECKPOINT)) {
f2fs_stop_ckpt_thread(sbi); f2fs_stop_ckpt_thread(sbi);
need_restart_ckpt = true;
} else { } else {
err = f2fs_start_ckpt_thread(sbi); err = f2fs_start_ckpt_thread(sbi);
if (err) { if (err) {
@@ -2083,6 +2075,7 @@ static int f2fs_remount(struct super_block *sb, int *flags, char *data)
err); err);
goto restore_gc; goto restore_gc;
} }
need_stop_ckpt = true;
} }
/* /*
@@ -2092,11 +2085,24 @@ static int f2fs_remount(struct super_block *sb, int *flags, char *data)
if ((*flags & SB_RDONLY) || !test_opt(sbi, FLUSH_MERGE)) { if ((*flags & SB_RDONLY) || !test_opt(sbi, FLUSH_MERGE)) {
clear_opt(sbi, FLUSH_MERGE); clear_opt(sbi, FLUSH_MERGE);
f2fs_destroy_flush_cmd_control(sbi, false); f2fs_destroy_flush_cmd_control(sbi, false);
need_restart_flush = true;
} else { } else {
err = f2fs_create_flush_cmd_control(sbi); err = f2fs_create_flush_cmd_control(sbi);
if (err) if (err)
goto restore_gc; goto restore_ckpt;
need_stop_flush = true;
} }
if (checkpoint_changed) {
if (test_opt(sbi, DISABLE_CHECKPOINT)) {
err = f2fs_disable_checkpoint(sbi);
if (err)
goto restore_flush;
} else {
f2fs_enable_checkpoint(sbi);
}
}
skip: skip:
#ifdef CONFIG_QUOTA #ifdef CONFIG_QUOTA
/* Release old quota file names */ /* Release old quota file names */
@@ -2111,6 +2117,21 @@ skip:
adjust_unusable_cap_perc(sbi); adjust_unusable_cap_perc(sbi);
*flags = (*flags & ~SB_LAZYTIME) | (sb->s_flags & SB_LAZYTIME); *flags = (*flags & ~SB_LAZYTIME) | (sb->s_flags & SB_LAZYTIME);
return 0; return 0;
restore_flush:
if (need_restart_flush) {
if (f2fs_create_flush_cmd_control(sbi))
f2fs_warn(sbi, "background flush thread has stopped");
} else if (need_stop_flush) {
clear_opt(sbi, FLUSH_MERGE);
f2fs_destroy_flush_cmd_control(sbi, false);
}
restore_ckpt:
if (need_restart_ckpt) {
if (f2fs_start_ckpt_thread(sbi))
f2fs_warn(sbi, "background ckpt thread has stopped");
} else if (need_stop_ckpt) {
f2fs_stop_ckpt_thread(sbi);
}
restore_gc: restore_gc:
if (need_restart_gc) { if (need_restart_gc) {
if (f2fs_start_gc_thread(sbi)) if (f2fs_start_gc_thread(sbi))