commit 11499808cf42e5ae3697da762a75d3fc9f0709b3
Author: Josef 'Jeff' Sipek <[EMAIL PROTECTED]>
Date:   Mon Feb 19 23:35:32 2007 -0500

    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 <[EMAIL PROTECTED]>
    Signed-off-by: Michael Halcrow <[EMAIL PROTECTED]>

diff --git a/fs/Kconfig b/fs/Kconfig
index 11bf529..5d62af6 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -1041,6 +1041,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://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
+
 menu "Miscellaneous filesystems"
 
 config ADFS_FS
@@ -1093,18 +1128,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
@@ -1555,25 +1578,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
_______________________________________________
unionfs-cvs mailing list: http://unionfs.filesystems.org/
[email protected]
http://www.fsl.cs.sunysb.edu/mailman/listinfo/unionfs-cvs

Reply via email to