These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / fs / ext4 / Kconfig

diff --git a/kernel/fs/ext4/Kconfig b/kernel/fs/ext4/Kconfig
index 024f228..b46e9fc 100644 (file)
--- a/kernel/fs/ext4/Kconfig
+++ b/kernel/fs/ext4/Kconfig
@@ -1,5 +1,38 @@
+# Ext3 configs are here for backward compatibility with old configs which may
+# have EXT3_FS set but not EXT4_FS set and thus would result in non-bootable
+# kernels after the removal of ext3 driver.
+config EXT3_FS
+       tristate "The Extended 3 (ext3) filesystem"
+       # These must match EXT4_FS selects...
+       select EXT4_FS
+       select JBD2
+       select CRC16
+       select CRYPTO
+       select CRYPTO_CRC32C
+       help
+         This config option is here only for backward compatibility. ext3
+         filesystem is now handled by the ext4 driver.
+
+config EXT3_FS_POSIX_ACL
+       bool "Ext3 POSIX Access Control Lists"
+       depends on EXT3_FS
+       select EXT4_FS_POSIX_ACL
+       select FS_POSIX_ACL
+       help
+         This config option is here only for backward compatibility. ext3
+         filesystem is now handled by the ext4 driver.
+
+config EXT3_FS_SECURITY
+       bool "Ext3 Security Labels"
+       depends on EXT3_FS
+       select EXT4_FS_SECURITY
+       help
+         This config option is here only for backward compatibility. ext3
+         filesystem is now handled by the ext4 driver.
+
 config EXT4_FS
        tristate "The Extended 4 (ext4) filesystem"
+       # Please update EXT3_FS selects when changing these
        select JBD2
        select CRC16
        select CRYPTO
@@ -16,26 +49,27 @@ config EXT4_FS
          up fsck time.  For more information, please see the web pages at
          http://ext4.wiki.kernel.org.
 
-         The ext4 filesystem will support mounting an ext3
-         filesystem; while there will be some performance gains from
-         the delayed allocation and inode table readahead, the best
-         performance gains will require enabling ext4 features in the
-         filesystem, or formatting a new filesystem as an ext4
-         filesystem initially.
+         The ext4 filesystem supports mounting an ext3 filesystem; while there
+         are some performance gains from the delayed allocation and inode
+         table readahead, the best performance gains require enabling ext4
+         features in the filesystem using tune2fs, or formatting a new
+         filesystem as an ext4 filesystem initially. Without explicit enabling
+         of ext4 features, the on disk filesystem format stays fully backward
+         compatible.
 
          To compile this file system support as a module, choose M here. The
          module will be called ext4.
 
          If unsure, say N.
 
-config EXT4_USE_FOR_EXT23
-       bool "Use ext4 for ext2/ext3 file systems"
+config EXT4_USE_FOR_EXT2
+       bool "Use ext4 for ext2 file systems"
        depends on EXT4_FS
-       depends on EXT3_FS=n || EXT2_FS=n
+       depends on EXT2_FS=n
        default y
        help
-         Allow the ext4 file system driver code to be used for ext2 or
-         ext3 file system mounts.  This allows users to reduce their
+         Allow the ext4 file system driver code to be used for ext2
+         file system mounts.  This allows users to reduce their
          compiled kernel size by using one file system driver for
          ext2, ext3, and ext4 file systems.
 
@@ -72,6 +106,7 @@ config EXT4_ENCRYPTION
        select CRYPTO_ECB
        select CRYPTO_XTS
        select CRYPTO_CTS
+       select CRYPTO_CTR
        select CRYPTO_SHA256
        select KEYS
        select ENCRYPTED_KEYS