]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commit
ext4: clean up superblock encryption mode fields
authorTheodore Ts'o <tytso@mit.edu>
Mon, 18 May 2015 17:18:47 +0000 (13:18 -0400)
committerTheodore Ts'o <tytso@mit.edu>
Mon, 18 May 2015 17:18:47 +0000 (13:18 -0400)
commitf5aed2c2a825618553b20e8a67109570489b40d7
treee0a69234f0f5f53ba1bbcab70290bebb79936f61
parentb7236e21d55ff9008737621c84dd8ee6c37c7c6d
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>
fs/ext4/crypto_policy.c
fs/ext4/ext4.h
fs/ext4/ialloc.c
fs/ext4/super.c