diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2015-05-18 13:18:47 -0400 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2015-05-18 13:18:47 -0400 |
| commit | f5aed2c2a825618553b20e8a67109570489b40d7 (patch) | |
| tree | e0a69234f0f5f53ba1bbcab70290bebb79936f61 /fs/ext4/super.c | |
| parent | b7236e21d55ff9008737621c84dd8ee6c37c7c6d (diff) | |
ext4: clean up superblock encryption mode fields
The superblock fields s_file_encryption_mode and s_dir_encryption_mode
are vestigal, so remove them as a cleanup. While we're at it, allow
file systems with both encryption and inline_data enabled at the same
time to work correctly. We can't have encrypted inodes with inline
data, but there's no reason to prohibit unencrypted inodes from using
the inline data feature.
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'fs/ext4/super.c')
| -rw-r--r-- | fs/ext4/super.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c index e0dac100fbe6..b0bd1c1061b3 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -3452,11 +3452,6 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) if (sb->s_bdev->bd_part) sbi->s_sectors_written_start = part_stat_read(sb->s_bdev->bd_part, sectors[1]); -#ifdef CONFIG_EXT4_FS_ENCRYPTION - /* Modes of operations for file and directory encryption. */ - sbi->s_file_encryption_mode = EXT4_ENCRYPTION_MODE_AES_256_XTS; - sbi->s_dir_encryption_mode = EXT4_ENCRYPTION_MODE_INVALID; -#endif /* Cleanup superblock name */ for (cp = sb->s_id; (cp = strchr(cp, '/'));) |