diff options
| author | Theodore Ts'o | 2015-04-16 07:56:00 +0200 |
|---|---|---|
| committer | Theodore Ts'o | 2015-04-16 07:56:00 +0200 |
| commit | 6ddb2447846a8ece111e316a2863c2355023682d (patch) | |
| tree | e56b2d3100baf35e7d99d79ff411c28bf8c5f4c2 /fs/ext4/ialloc.c | |
| parent | ext4 crypto: add symlink encryption (diff) | |
| download | kernel-qcow2-linux-6ddb2447846a8ece111e316a2863c2355023682d.tar.gz kernel-qcow2-linux-6ddb2447846a8ece111e316a2863c2355023682d.tar.xz kernel-qcow2-linux-6ddb2447846a8ece111e316a2863c2355023682d.zip | |
ext4 crypto: enable encryption feature flag
Also add the test dummy encryption mode flag so we can more easily
test the encryption patches using xfstests.
Signed-off-by: Michael Halcrow <mhalcrow@google.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'fs/ext4/ialloc.c')
| -rw-r--r-- | fs/ext4/ialloc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/ext4/ialloc.c b/fs/ext4/ialloc.c index 850267c89407..2cf18a2d5c72 100644 --- a/fs/ext4/ialloc.c +++ b/fs/ext4/ialloc.c @@ -998,7 +998,8 @@ got: /* If the directory encrypted, then we should encrypt the inode. */ if ((S_ISDIR(mode) || S_ISREG(mode) || S_ISLNK(mode)) && - ext4_encrypted_inode(dir)) + (ext4_encrypted_inode(dir) || + DUMMY_ENCRYPTION_ENABLED(sbi))) ext4_set_inode_flag(inode, EXT4_INODE_ENCRYPT); ext4_set_inode_flags(inode); |