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

Commit 7aa83126 authored by Chao Yu's avatar Chao Yu Committed by Jaegeuk Kim
Browse files

f2fs: move s_res{u,g}id initialization to default_options() 



Let default_options() initialize s_res{u,g}id with default value like
other options.

Signed-off-by: default avatarChao Yu <yuchao0@huawei.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 87e841d4

fs/f2fs/super.c

+2 −3
Original line number Diff line number Diff line
@@ -1354,6 +1354,8 @@ static void default_options(struct f2fs_sb_info *sbi) 
	F2FS_OPTION(sbi).alloc_mode = ALLOC_MODE_DEFAULT;

	F2FS_OPTION(sbi).fsync_mode = FSYNC_MODE_POSIX;

	F2FS_OPTION(sbi).test_dummy_encryption = false;

	F2FS_OPTION(sbi).s_resuid = make_kuid(&init_user_ns, F2FS_DEF_RESUID);

	F2FS_OPTION(sbi).s_resgid = make_kgid(&init_user_ns, F2FS_DEF_RESGID);

	sbi->readdir_ra = 1;



	set_opt(sbi, BG_GC);
@@ -2701,9 +2703,6 @@ static int f2fs_fill_super(struct super_block *sb, void *data, int silent) 
	sb->s_fs_info = sbi;

	sbi->raw_super = raw_super;



	F2FS_OPTION(sbi).s_resuid = make_kuid(&init_user_ns, F2FS_DEF_RESUID);

	F2FS_OPTION(sbi).s_resgid = make_kgid(&init_user_ns, F2FS_DEF_RESGID);



	/* precompute checksum seed for metadata */

	if (f2fs_sb_has_inode_chksum(sb))

		sbi->s_chksum_seed = f2fs_chksum(sbi, ~0, raw_super->uuid,