Unionfs: merge fixes from rebasing to 2.6.29.

Signed-off-by: Erez Zadok <ezk@cs.sunysb.edu>

diff --git a/fs/Kconfig b/fs/Kconfig
index ed45ee5f4b651aeee23dae2b7a681b78c4d3ba2a..0e6182cfa494a11a5f175841718c062bea4673d7 100644 (file)
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -152,48 +152,6 @@ 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