Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2443b8b3 authored by Chao Yu's avatar Chao Yu Committed by Jaegeuk Kim
Browse files

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: default avatarChao Yu <yuchao0@huawei.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 36dbd328

fs/f2fs/super.c

+6 −0
Original line number Diff line number Diff line
@@ -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 @@ static int f2fs_remount(struct super_block *sb, int *flags, char *data) 
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;

}