Commit 7d6ee503 authored by Eric Sandeen's avatar Eric Sandeen Committed by Jaegeuk Kim
Browse files

f2fs: make INLINECRYPT a mount option flag 



Set INLINECRYPT into sbi during parsing, and transfer it to the sb in
fill_super, so that an sb is not required during option parsing.

Signed-off-by: default avatarEric Sandeen <sandeen@redhat.com>
Reviewed-by: default avatarChao Yu <chao@kernel.org>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent abd0e040

fs/f2fs/f2fs.h

+1 −0
Original line number Diff line number Diff line
@@ -116,6 +116,7 @@ extern const char *f2fs_fault_name[FAULT_MAX]; 
#define F2FS_MOUNT_COMPRESS_CACHE	0x04000000

#define F2FS_MOUNT_AGE_EXTENT_CACHE	0x08000000

#define F2FS_MOUNT_NAT_BITS		0x10000000

#define F2FS_MOUNT_INLINECRYPT		0x20000000



#define F2FS_OPTION(sbi)	((sbi)->mount_opt)

#define clear_opt(sbi, option)	(F2FS_OPTION(sbi).opt &= ~F2FS_MOUNT_##option)

fs/f2fs/super.c

+4 −1
Original line number Diff line number Diff line
@@ -1039,7 +1039,7 @@ static int parse_options(struct super_block *sb, char *options, bool is_remount) 
			break;

		case Opt_inlinecrypt:

#ifdef CONFIG_FS_ENCRYPTION_INLINE_CRYPT

			sb->s_flags |= SB_INLINECRYPT;

			set_opt(sbi, INLINECRYPT);

#else

			f2fs_info(sbi, "inline encryption not supported");

#endif
@@ -4585,6 +4585,9 @@ static int f2fs_fill_super(struct super_block *sb, void *data, int silent) 
	sb->s_time_gran = 1;

	sb->s_flags = (sb->s_flags & ~SB_POSIXACL) |

		(test_opt(sbi, POSIX_ACL) ? SB_POSIXACL : 0);

	if (test_opt(sbi, INLINECRYPT))

		sb->s_flags |= SB_INLINECRYPT;



	super_set_uuid(sb, (void *) raw_super->uuid, sizeof(raw_super->uuid));

	super_set_sysfs_name_bdev(sb);

	sb->s_iflags |= SB_I_CGROUPWB;