diff options
| author | Chandan Rajendra <chandan@linux.ibm.com> | 2019-10-23 05:33:12 +0200 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2019-11-14 22:40:45 +0100 |
| commit | 196624e192f8e767b06924e46495c56846b2b64e (patch) | |
| tree | ead1e1932dcd732625a4e390457d66e97d128206 /fs | |
| parent | fs/buffer.c: support fscrypt in block_read_full_page() (diff) | |
| download | linux-196624e192f8e767b06924e46495c56846b2b64e.tar.xz linux-196624e192f8e767b06924e46495c56846b2b64e.zip | |
ext4: Enable encryption for subpage-sized blocks
Now that we have the code to support encryption for subpage-sized
blocks, this commit removes the conditional check in filesystem mount
code.
The commit also changes the support statement in
Documentation/filesystems/fscrypt.rst to reflect the fact that
encryption on filesystems with blocksize less than page size now works.
[EB: Tested with 'gce-xfstests -c ext4/encrypt_1k -g auto', using the
new "encrypt_1k" config I created. All tests pass except for those that
already fail or are excluded with the encrypt or 1k configs, and 2 tests
that try to create 1023-byte symlinks which fails since encrypted
symlinks are limited to blocksize-3 bytes. Also ran the dedicated
encryption tests using 'kvm-xfstests -c ext4/1k -g encrypt'; all pass,
including the on-disk ciphertext verification tests.]
Signed-off-by: Chandan Rajendra <chandan@linux.ibm.com>
Signed-off-by: Eric Biggers <ebiggers@google.com>
Link: https://lore.kernel.org/r/20191023033312.361355-3-ebiggers@kernel.org
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ext4/super.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 7796e2ffc294..66693510326f 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -4429,13 +4429,6 @@ no_journal: } } - if ((DUMMY_ENCRYPTION_ENABLED(sbi) || ext4_has_feature_encrypt(sb)) && - (blocksize != PAGE_SIZE)) { - ext4_msg(sb, KERN_ERR, - "Unsupported blocksize for fs encryption"); - goto failed_mount_wq; - } - if (ext4_has_feature_verity(sb) && blocksize != PAGE_SIZE) { ext4_msg(sb, KERN_ERR, "Unsupported blocksize for fs-verity"); goto failed_mount_wq; |