diff options
| author | Chao Yu <yuchao0@huawei.com> | 2016-09-26 13:45:06 +0200 |
|---|---|---|
| committer | Jaegeuk Kim <jaegeuk@kernel.org> | 2016-10-01 02:34:34 +0200 |
| commit | 2443b8b363917468e2fb163b34c8f14fe1546251 (patch) | |
| tree | 3447ea6b56ba350e0040aa60184ce25e8d5b1d40 /fs | |
| parent | f2fs: do fault injection initialization in default_options (diff) | |
| download | linux-2443b8b363917468e2fb163b34c8f14fe1546251.tar.xz linux-2443b8b363917468e2fb163b34c8f14fe1546251.zip | |
f2fs: fix to recover old fault injection config in ->remount_fs
In ->remount_fs, we didn't recover original fault injection config if
we encounter error, fix it.
Signed-off-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/f2fs/super.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c index 785d0fdf6e76..40aecd78cccc 100644 --- a/fs/f2fs/super.c +++ b/fs/f2fs/super.c @@ -1000,6 +1000,9 @@ static int f2fs_remount(struct super_block *sb, int *flags, char *data) bool need_restart_gc = false; bool need_stop_gc = false; bool no_extent_cache = !test_opt(sbi, EXTENT_CACHE); +#ifdef CONFIG_F2FS_FAULT_INJECTION + struct f2fs_fault_info ffi = sbi->fault_info; +#endif /* * Save the old mount options in case we @@ -1095,6 +1098,9 @@ restore_gc: restore_opts: sbi->mount_opt = org_mount_opt; sbi->active_logs = active_logs; +#ifdef CONFIG_F2FS_FAULT_INJECTION + sbi->fault_info = ffi; +#endif return err; } |