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 5e3686a8d6c7076d1d3f95b0bed2ccfd7e955c0a..b3a3819058694404304cf05cc92ec2209797cad0 100644 (file)
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -186,48 +186,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
@@ -265,6 +223,7 @@ source "fs/qnx4/Kconfig"
 source "fs/romfs/Kconfig"
 source "fs/sysv/Kconfig"
 source "fs/ufs/Kconfig"
+
 endif # MISC_FILESYSTEMS
 
 menuconfig NETWORK_FILESYSTEMS

diff --git a/fs/unionfs/Kconfig b/fs/unionfs/Kconfig
index 92c7655d0087d4987f9a1e431b073736b59076d7..f3c1ac453da27af5120554213e86a7eca0648ee8 100644 (file)
--- a/fs/unionfs/Kconfig
+++ b/fs/unionfs/Kconfig
@@ -6,7 +6,7 @@ config UNION_FS
          merge the contents of several directories (branches), while keeping
          their physical content separate.
 
-         See <http://www.unionfs.org> for details
+         See <http://unionfs.filesystems.org> for details
 
 config UNION_FS_XATTR
        bool "Unionfs extended attributes"
@@ -16,3 +16,9 @@ config UNION_FS_XATTR
          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.