Re: [PATCH v8 10/11] f2fs: add inline encryption support
From: Eric Biggers <ebiggers@kernel.org>
Date: 2020-03-15 17:16:56
Also in:
linux-block, linux-f2fs-devel, linux-fscrypt, linux-fsdevel, linux-scsi
On Thu, Mar 12, 2020 at 01:02:52AM -0700, Satya Tangirala wrote:
quoted hunk ↗ jump to hunk
diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h index 5355be6b6755..75817f0dc6f8 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h@@ -139,6 +139,9 @@ struct f2fs_mount_info { int alloc_mode; /* segment allocation policy */ int fsync_mode; /* fsync policy */ bool test_dummy_encryption; /* test dummy encryption */ +#ifdef CONFIG_FS_ENCRYPTION + bool inlinecrypt; /* inline encryption enabled */ +#endif block_t unusable_cap; /* Amount of space allowed to be * unusable when disabling checkpoint */
This bool is unused now.
quoted hunk ↗ jump to hunk
@@ -1568,6 +1577,9 @@ 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; +#ifdef CONFIG_FS_ENCRYPTION + sbi->sb->s_flags &= ~SB_INLINECRYPT; +#endif
This really should be CONFIG_FS_ENCRYPTION_INLINE_CRYPT, but actually there's no need for the #ifdef at all. Just clear the flag unconditionally. - Eric