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

Commit 498c5e9f authored by Yunlei He's avatar Yunlei He Committed by Jaegeuk Kim
Browse files

f2fs: add default mount options to remount 



I use f2fs filesystem with /data partition on my Android phone
by the default mount options. When I remount /data in order to
adding discard option to run some benchmarks, I find the default
options such as background_gc, user_xattr and acl turned off.

So I introduce a function named default_options in super.c. It do
some default setting, and both mount and remount operations will
call this function to complete default setting.

Signed-off-by: default avatarYunlei He <heyunlei@huawei.com>
Reviewed-by: default avatarChao Yu <chao2.yu@samsung.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent d690358b

fs/f2fs/super.c

+18 −13
Original line number Diff line number Diff line
@@ -661,6 +661,22 @@ static const struct file_operations f2fs_seq_segment_info_fops = { 
	.release = single_release,

};



static void default_options(struct f2fs_sb_info *sbi)

{

	/* init some FS parameters */

	sbi->active_logs = NR_CURSEG_TYPE;



	set_opt(sbi, BG_GC);

	set_opt(sbi, INLINE_DATA);



#ifdef CONFIG_F2FS_FS_XATTR

	set_opt(sbi, XATTR_USER);

#endif

#ifdef CONFIG_F2FS_FS_POSIX_ACL

	set_opt(sbi, POSIX_ACL);

#endif

}



static int f2fs_remount(struct super_block *sb, int *flags, char *data)

{

	struct f2fs_sb_info *sbi = F2FS_SB(sb);
@@ -679,7 +695,7 @@ static int f2fs_remount(struct super_block *sb, int *flags, char *data) 
	active_logs = sbi->active_logs;



	sbi->mount_opt.opt = 0;

	sbi->active_logs = NR_CURSEG_TYPE;

	default_options(sbi);



	/* parse mount options */

	err = parse_options(sb, data);
@@ -1021,18 +1037,7 @@ static int f2fs_fill_super(struct super_block *sb, void *data, int silent) 
		goto free_sbi;



	sb->s_fs_info = sbi;

	/* init some FS parameters */

	sbi->active_logs = NR_CURSEG_TYPE;



	set_opt(sbi, BG_GC);

	set_opt(sbi, INLINE_DATA);



#ifdef CONFIG_F2FS_FS_XATTR

	set_opt(sbi, XATTR_USER);

#endif

#ifdef CONFIG_F2FS_FS_POSIX_ACL

	set_opt(sbi, POSIX_ACL);

#endif

	default_options(sbi);

	/* parse mount options */

	options = kstrdup((const char *)data, GFP_KERNEL);

	if (data && !options) {