diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2015-05-02 16:29:19 +0200 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2015-05-02 16:29:19 +0200 |
| commit | fb63e5489f7ef5bb4d1a655984ca7ef98ffc5849 (patch) | |
| tree | 720ff0ac4dfbbb66912fa2ea4fba04ba1b2391b6 /fs/ext4 | |
| parent | ext4 crypto: add padding to filenames before encrypting (diff) | |
| download | linux-fb63e5489f7ef5bb4d1a655984ca7ef98ffc5849.tar.xz linux-fb63e5489f7ef5bb4d1a655984ca7ef98ffc5849.zip | |
ext4 crypto: do not select from EXT4_FS_ENCRYPTION
This patch adds a tristate EXT4_ENCRYPTION to do the selections
for EXT4_FS_ENCRYPTION because selecting from a bool causes all
the selected options to be built-in, even if EXT4 itself is a
module.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to '')
| -rw-r--r-- | fs/ext4/Kconfig | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/fs/ext4/Kconfig b/fs/ext4/Kconfig index 18228c201f7f..024f2284d3f6 100644 --- a/fs/ext4/Kconfig +++ b/fs/ext4/Kconfig @@ -64,8 +64,8 @@ config EXT4_FS_SECURITY If you are not using a security module that requires using extended attributes for file security labels, say N. -config EXT4_FS_ENCRYPTION - bool "Ext4 Encryption" +config EXT4_ENCRYPTION + tristate "Ext4 Encryption" depends on EXT4_FS select CRYPTO_AES select CRYPTO_CBC @@ -81,6 +81,11 @@ config EXT4_FS_ENCRYPTION efficient since it avoids caching the encrypted and decrypted pages in the page cache. +config EXT4_FS_ENCRYPTION + bool + default y + depends on EXT4_ENCRYPTION + config EXT4_DEBUG bool "EXT4 debugging support" depends on EXT4_FS |