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 d7367810470fb3c3dc7aa8a2879bf7f5f640c9bc..09fc7dcd9eb377fd43ab3e7bcbb5868e9c0d610d 100644 (file)
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -167,6 +167,48 @@ source "fs/configfs/Kconfig"
 
 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.
+
+config UNION_FS_DEBUG
+       bool "Debug Unionfs"
+       depends on UNION_FS
+       help
+         If you say Y here, you can turn on debugging output from Unionfs.
+
+endmenu
+
 menuconfig MISC_FILESYSTEMS
        bool "Miscellaneous filesystems"
        default y
@@ -185,6 +227,7 @@ if MISC_FILESYSTEMS
 source "fs/adfs/Kconfig"
 source "fs/affs/Kconfig"
 source "fs/ecryptfs/Kconfig"
+source "fs/unionfs/Kconfig"
 source "fs/hfs/Kconfig"
 source "fs/hfsplus/Kconfig"
 source "fs/befs/Kconfig"
@@ -210,25 +253,6 @@ source "fs/exofs/Kconfig"
 source "fs/f2fs/Kconfig"
 source "fs/efivarfs/Kconfig"
 
-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.
-
 endif # MISC_FILESYSTEMS
 
 source "fs/exofs/Kconfig.ore"

diff --git a/fs/unionfs/Kconfig b/fs/unionfs/Kconfig
new file mode 100644 (file)
index 0000000..f3c1ac4
--- /dev/null
+++ b/fs/unionfs/Kconfig
@@ -0,0 +1,24 @@
+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.
+
+config UNION_FS_DEBUG
+       bool "Debug Unionfs"
+       depends on UNION_FS
+       help
+         If you say Y here, you can turn on debugging output from Unionfs.