ocfs2: move lockres qstr next to hlist_node structure

[linux-2.6] / fs / Kconfig

diff --git a/fs/Kconfig b/fs/Kconfig
index 20f9b557732d2c9faf031d275878d13602131922..6c5051802bd285bebefc266a282cf3539846850f 100644 (file)
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -53,7 +53,7 @@ config EXT2_FS_SECURITY
 
 config EXT2_FS_XIP
        bool "Ext2 execute in place support"
 
 config EXT2_FS_XIP
        bool "Ext2 execute in place support"

-       depends on EXT2_FS
+       depends on EXT2_FS && MMU

        help
          Execute in place can be used on memory-backed block devices. If you
          enable this option, you can select to mount block devices which are
        help
          Execute in place can be used on memory-backed block devices. If you
          enable this option, you can select to mount block devices which are


@@ -776,7 +776,8 @@ endmenu
 menu "Pseudo filesystems"
 
 config PROC_FS
 menu "Pseudo filesystems"
 
 config PROC_FS

-       bool "/proc file system support"
+       bool "/proc file system support" if EMBEDDED
+       default y

        help
          This is a virtual file system providing information about the status
          of the system. "Virtual" means that it doesn't take up any space on
        help
          This is a virtual file system providing information about the status
          of the system. "Virtual" means that it doesn't take up any space on


@@ -1370,11 +1371,19 @@ config UFS_FS
 
 config UFS_FS_WRITE
        bool "UFS file system write support (DANGEROUS)"
 
 config UFS_FS_WRITE
        bool "UFS file system write support (DANGEROUS)"

-       depends on UFS_FS && EXPERIMENTAL && BROKEN
+       depends on UFS_FS && EXPERIMENTAL

        help
          Say Y here if you want to try writing to UFS partitions. This is
          experimental, so you should back up your UFS partitions beforehand.
 
        help
          Say Y here if you want to try writing to UFS partitions. This is
          experimental, so you should back up your UFS partitions beforehand.
 

+config UFS_DEBUG
+       bool "UFS debugging"
+       depends on UFS_FS
+       help
+         If you are experiencing any problems with the UFS filesystem, say
+         Y here.  This will result in _many_ additional debugging messages to be
+         written to the system log.
+

 endmenu
 
 menu "Network File Systems"
 endmenu
 
 menu "Network File Systems"


@@ -1481,7 +1490,12 @@ config NFSD
        select LOCKD
        select SUNRPC
        select EXPORTFS
        select LOCKD
        select SUNRPC
        select EXPORTFS

-       select NFS_ACL_SUPPORT if NFSD_V3_ACL || NFSD_V2_ACL
+       select NFSD_V2_ACL if NFSD_V3_ACL
+       select NFS_ACL_SUPPORT if NFSD_V2_ACL
+       select NFSD_TCP if NFSD_V4
+       select CRYPTO_MD5 if NFSD_V4
+       select CRYPTO if NFSD_V4
+       select FS_POSIX_ACL if NFSD_V4

        help
          If you want your Linux box to act as an NFS *server*, so that other
          computers on your local network which support NFS can access certain
        help
          If you want your Linux box to act as an NFS *server*, so that other
          computers on your local network which support NFS can access certain


@@ -1519,7 +1533,6 @@ config NFSD_V3
 config NFSD_V3_ACL
        bool "Provide server support for the NFSv3 ACL protocol extension"
        depends on NFSD_V3
 config NFSD_V3_ACL
        bool "Provide server support for the NFSv3 ACL protocol extension"
        depends on NFSD_V3

-       select NFSD_V2_ACL

        help
          Implement the NFSv3 ACL protocol extension for manipulating POSIX
          Access Control Lists on exported file systems. NFS clients should
        help
          Implement the NFSv3 ACL protocol extension for manipulating POSIX
          Access Control Lists on exported file systems. NFS clients should


@@ -1529,10 +1542,6 @@ config NFSD_V3_ACL
 config NFSD_V4
        bool "Provide NFSv4 server support (EXPERIMENTAL)"
        depends on NFSD_V3 && EXPERIMENTAL
 config NFSD_V4
        bool "Provide NFSv4 server support (EXPERIMENTAL)"
        depends on NFSD_V3 && EXPERIMENTAL

-       select NFSD_TCP
-       select CRYPTO_MD5
-       select CRYPTO
-       select FS_POSIX_ACL

        help
          If you would like to include the NFSv4 server as well as the NFSv2
          and NFSv3 servers, say Y here.  This feature is experimental, and
        help
          If you would like to include the NFSv4 server as well as the NFSv2
          and NFSv3 servers, say Y here.  This feature is experimental, and