summaryrefslogtreecommitdiffstats
path: root/fs/f2fs/super.c
diff options
context:
space:
mode:
authorChao Yu <yuchao0@huawei.com>2018-06-11 06:02:01 -0400
committerJaegeuk Kim <jaegeuk@kernel.org>2018-07-27 05:03:59 -0400
commit4cac90d5491c9a157909b9d45128997d35624e01 (patch)
tree8a1b892449e0aa65ded4f176523d6ad5a16d151e /fs/f2fs/super.c
parent0aa7e0f8c0a0246ea7f407e32b7277ec9c084c15 (diff)
f2fs: relocate readdir_ra configure initialization
readdir_ra is sysfs configuration instead of mount option, so it should not be initialized in default_options(), otherwise after remount, it can be reset to be enabled which may not as user wish, so let's move it to f2fs_tuning_parameters(). Signed-off-by: Chao Yu <yuchao0@huawei.com> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Diffstat (limited to 'fs/f2fs/super.c')
-rw-r--r--fs/f2fs/super.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index a87a398af77f..89a347243e9a 100644
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -1356,7 +1356,6 @@ static void default_options(struct f2fs_sb_info *sbi)
1356 F2FS_OPTION(sbi).test_dummy_encryption = false; 1356 F2FS_OPTION(sbi).test_dummy_encryption = false;
1357 F2FS_OPTION(sbi).s_resuid = make_kuid(&init_user_ns, F2FS_DEF_RESUID); 1357 F2FS_OPTION(sbi).s_resuid = make_kuid(&init_user_ns, F2FS_DEF_RESUID);
1358 F2FS_OPTION(sbi).s_resgid = make_kgid(&init_user_ns, F2FS_DEF_RESGID); 1358 F2FS_OPTION(sbi).s_resgid = make_kgid(&init_user_ns, F2FS_DEF_RESGID);
1359 sbi->readdir_ra = 1;
1360 1359
1361 set_opt(sbi, BG_GC); 1360 set_opt(sbi, BG_GC);
1362 set_opt(sbi, INLINE_XATTR); 1361 set_opt(sbi, INLINE_XATTR);
@@ -2650,6 +2649,8 @@ static void f2fs_tuning_parameters(struct f2fs_sb_info *sbi)
2650 sm_i->dcc_info->discard_granularity = 1; 2649 sm_i->dcc_info->discard_granularity = 1;
2651 sm_i->ipu_policy = 1 << F2FS_IPU_FORCE; 2650 sm_i->ipu_policy = 1 << F2FS_IPU_FORCE;
2652 } 2651 }
2652
2653 sbi->readdir_ra = 1;
2653} 2654}
2654 2655
2655static int f2fs_fill_super(struct super_block *sb, void *data, int silent) 2656static int f2fs_fill_super(struct super_block *sb, void *data, int silent)