Merge branch 'parisc-4.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller...

[linux.git] / fs / ubifs / Kconfig

diff --git a/fs/ubifs/Kconfig b/fs/ubifs/Kconfig
index 7ff7712f284e030baf4e90a268c0577429497574..0a908ae7af1382d46efa5c8073300db4680ce7e2 100644 (file)
--- a/fs/ubifs/Kconfig
+++ b/fs/ubifs/Kconfig
@@ -50,3 +50,14 @@ config UBIFS_ATIME_SUPPORT
          strictatime is the "heavy", relatime is "lighter", etc.
 
          If unsure, say 'N'
+
+config UBIFS_FS_ENCRYPTION
+       bool "UBIFS Encryption"
+       depends on UBIFS_FS
+       select FS_ENCRYPTION
+       default n
+       help
+         Enable encryption of UBIFS files and directories. This
+         feature is similar to ecryptfs, but it is more memory
+         efficient since it avoids caching the encrypted and
+         decrypted pages in the page cache.