fs/: Move eCryptfs & Unionfs config options into a sub-menu

Using The Misc filesystems sub-menu for layered/stackable filesystems only
makes it harder for users to find eCryptfs/Unionfs.

Additionally, the menu can be easily turned into a menuconfig, which could
be used to turn on any VFS/VM functionality required by layered filesystems
(there is none at the moment).

Signed-off-by: Josef 'Jeff' Sipek <jsipek@cs.sunysb.edu>
Signed-off-by: Michael Halcrow <mhalcrow@us.ibm.com>

diff --git a/fs/Kconfig b/fs/Kconfig
index 81ba2d4b61beacb886ed5064db34d44458115334..b03442d56cfdf109ffd8c2d03e03ac0f352de092 100644 (file)
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -1003,6 +1003,41 @@ config CONFIGFS_FS
 
 endmenu
 
+menu "Layered filesystems"
+
+config ECRYPT_FS
+       tristate "eCrypt filesystem layer support (EXPERIMENTAL)"
+       depends on EXPERIMENTAL && KEYS && CRYPTO && NET
+       help
+         Encrypted filesystem that operates on the VFS layer.  See
+         <file:Documentation/filesystems/ecryptfs.txt> to learn more about
+         eCryptfs.  Userspace components are required and can be
+         obtained from <http://ecryptfs.sf.net>.
+
+         To compile this file system support as a module, choose M here: the
+         module will be called ecryptfs.
+
+config UNION_FS
+       tristate "Union file system (EXPERIMENTAL)"
+       depends on EXPERIMENTAL
+       help
+         Unionfs is a stackable unification file system, which appears to
+         merge the contents of several directories (branches), while keeping
+         their physical content separate.
+
+         See <http://unionfs.filesystems.org/> for details
+
+config UNION_FS_XATTR
+       bool "Unionfs extended attributes"
+       depends on UNION_FS
+       help
+         Extended attributes are name:value pairs associated with inodes by
+         the kernel or by users (see the attr(5) manual page).
+
+         If unsure, say N.
+
+endmenu
+
 menu "Miscellaneous filesystems"
 
 config ADFS_FS
@@ -1055,18 +1090,6 @@ config AFFS_FS
          To compile this file system support as a module, choose M here: the
          module will be called affs.  If unsure, say N.
 
-config ECRYPT_FS
-       tristate "eCrypt filesystem layer support (EXPERIMENTAL)"
-       depends on EXPERIMENTAL && KEYS && CRYPTO && NET
-       help
-         Encrypted filesystem that operates on the VFS layer.  See
-         <file:Documentation/filesystems/ecryptfs.txt> to learn more about
-         eCryptfs.  Userspace components are required and can be
-         obtained from <http://ecryptfs.sf.net>.
-
-         To compile this file system support as a module, choose M here: the
-         module will be called ecryptfs.
-
 config HFS_FS
        tristate "Apple Macintosh file system support (EXPERIMENTAL)"
        depends on BLOCK && EXPERIMENTAL
@@ -1549,25 +1572,6 @@ config UFS_DEBUG
          Y here.  This will result in _many_ additional debugging messages to be
          written to the system log.
 
-config UNION_FS
-       tristate "Union file system (EXPERIMENTAL)"
-       depends on EXPERIMENTAL
-       help
-         Unionfs is a stackable unification file system, which appears to
-         merge the contents of several directories (branches), while keeping
-         their physical content separate.
-
-         See <http://www.unionfs.org> for details
-
-config UNION_FS_XATTR
-       bool "Unionfs extended attributes"
-       depends on UNION_FS
-       help
-         Extended attributes are name:value pairs associated with inodes by
-         the kernel or by users (see the attr(5) manual page).
-
-         If unsure, say N.
-
 endmenu
 
 menuconfig NETWORK_FILESYSTEMS