ext4: clean up superblock encryption mode fields

Browse source

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>

...

This commit is contained in:

Theodore Ts'o 2015-05-18 13:18:47 -04:00

parent b7236e21d5

commit f5aed2c2a8

4 changed files with 7 additions and 32 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

9

fs/ext4/crypto_policy.c

View file

6

fs/ext4/ext4.h

View file

19

fs/ext4/ialloc.c

View file

5

fs/ext4/super.c

View file