Fix f_version type: should be u64 instead of unsigned long

[linux-2.6] / fs / Kconfig

diff --git a/fs/Kconfig b/fs/Kconfig
index e19423a2aa7d5f0c355eb8d1f3fa54c8c0bb5e5c..9a40a9c665c7c577c6b14861fbc641ff410a0f72 100644 (file)
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -251,7 +251,7 @@ config JBD2
 
 config JBD2_DEBUG
        bool "JBD2 (ext4dev/ext4) debugging support"
-       depends on JBD2
+       depends on JBD2 && DEBUG_FS
        help
          If you are using the ext4dev/ext4 journaled file system (or
          potentially any other filesystem/device using JBD2), this option
@@ -260,10 +260,10 @@ config JBD2_DEBUG
          By default, the debugging output will be turned off.
 
          If you select Y here, then you will be able to turn on debugging
-         with "echo N > /proc/sys/fs/jbd2-debug", where N is a number between
-         1 and 5. The higher the number, the more debugging output is
-         generated.  To turn debugging off again, do
-         "echo 0 > /proc/sys/fs/jbd2-debug".
+         with "echo N > /sys/kernel/debug/jbd2/jbd2-debug", where N is a
+         number between 1 and 5. The higher the number, the more debugging
+         output is generated.  To turn debugging off again, do
+         "echo 0 > /sys/kernel/debug/jbd2/jbd2-debug".
 
 config FS_MBCACHE
 # Meta block cache for Extended Attributes (ext2/ext3/ext4)
@@ -441,9 +441,6 @@ config OCFS2_FS
 
          Note: Features which OCFS2 does not support yet:
                  - extended attributes
-                 - shared writeable mmap
-                 - loopback is supported, but data written will not
-                   be cluster coherent.
                  - quotas
                  - cluster aware flock
                  - Directory change notification (F_NOTIFY)
@@ -558,7 +555,7 @@ config QUOTACTL
        default y
 
 config DNOTIFY
-       bool "Dnotify support" if EMBEDDED
+       bool "Dnotify support"
        default y
        help
          Dnotify is a directory-based per-fd file change notification system
@@ -566,7 +563,7 @@ config DNOTIFY
          superior alternatives, but some applications may still rely on
          dnotify.
 
-         Because of this, if unsure, say Y.
+         If unsure, say Y.
 
 config AUTOFS_FS
        tristate "Kernel automounter support"
@@ -991,7 +988,7 @@ config TMPFS_POSIX_ACL
 
 config HUGETLBFS
        bool "HugeTLB file system support"
-       depends on X86 || IA64 || PPC64 || SPARC64 || SUPERH || BROKEN
+       depends on X86 || IA64 || PPC64 || SPARC64 || (SUPERH && MMU) || BROKEN
        help
          hugetlbfs is a filesystem backing for HugeTLB pages, based on
          ramfs. For architectures that support it, say Y here and read
@@ -1314,6 +1311,18 @@ config JFFS2_ZLIB
 
          Say 'Y' if unsure.
 
+config JFFS2_LZO
+       bool "JFFS2 LZO compression support" if JFFS2_COMPRESSION_OPTIONS
+       select LZO_COMPRESS
+       select LZO_DECOMPRESS
+       depends on JFFS2_FS
+       default n
+       help
+         minilzo-based compression. Generally works better than Zlib.
+
+         This feature was added in July, 2007. Say 'N' if you need
+         compatibility with older bootloaders or kernels.
+
 config JFFS2_RTIME
        bool "JFFS2 RTIME compression support" if JFFS2_COMPRESSION_OPTIONS
        depends on JFFS2_FS
@@ -1353,6 +1362,13 @@ config JFFS2_CMODE_SIZE
          Tries all compressors and chooses the one which has the smallest
          result.
 
+config JFFS2_CMODE_FAVOURLZO
+       bool "Favour LZO"
+       help
+         Tries all compressors and chooses the one which has the smallest
+         result but gives some preference to LZO (which has faster
+         decompression) at the expense of size.
+
 endchoice
 
 config CRAMFS
@@ -1682,7 +1698,8 @@ config NFSD_V3_ACL
 
 config NFSD_V4
        bool "Provide NFSv4 server support (EXPERIMENTAL)"
-       depends on NFSD_V3 && EXPERIMENTAL
+       depends on NFSD && NFSD_V3 && EXPERIMENTAL
+       select RPCSEC_GSS_KRB5
        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
@@ -1738,6 +1755,14 @@ config SUNRPC
 config SUNRPC_GSS
        tristate
 
+config SUNRPC_XPRT_RDMA
+       tristate "RDMA transport for sunrpc (EXPERIMENTAL)"
+       depends on SUNRPC && INFINIBAND && EXPERIMENTAL
+       default m
+       help
+         Adds a client RPC transport for supporting kernel NFS over RDMA
+         mounts, including Infiniband and iWARP. Experimental.
+
 config SUNRPC_BIND34
        bool "Support for rpcbind versions 3 & 4 (EXPERIMENTAL)"
        depends on SUNRPC && EXPERIMENTAL
@@ -2056,7 +2081,7 @@ config AFS_DEBUG
 
 config 9P_FS
        tristate "Plan 9 Resource Sharing Support (9P2000) (Experimental)"
-       depends on INET && EXPERIMENTAL
+       depends on INET && NET_9P && EXPERIMENTAL
        help
          If you say Y here, you will get experimental support for
          Plan 9 resource sharing via the 9P2000 protocol.