1 files changed, 49 insertions, 31 deletions

diff --git a/fs/Kconfig b/fs/Kconfig
index cc28a69246a7..987b5d7cb21a 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -236,6 +236,7 @@ config JBD_DEBUG
 
 config JBD2
         tristate
+        select CRC32
         help
           This is a generic journaling layer for block devices that support
           both 32-bit and 64-bit block numbers.  It is currently used by
@@ -440,14 +441,8 @@ config OCFS2_FS
           Tools web page:      http://oss.oracle.com/projects/ocfs2-tools
           OCFS2 mailing lists: http://oss.oracle.com/projects/ocfs2/mailman/
 
-          Note: Features which OCFS2 does not support yet:
-                  - extended attributes
-                  - quotas
-                  - cluster aware flock
-                  - Directory change notification (F_NOTIFY)
-                  - Distributed Caching (F_SETLEASE/F_GETLEASE/break_lease)
-                  - POSIX ACLs
-                  - readpages / writepages (not user visible)
+          For more information on OCFS2, see the file
+          <file:Documentation/filesystems/ocfs2.txt>.
 
 config OCFS2_DEBUG_MASKLOG
         bool "OCFS2 logging support"
@@ -459,6 +454,15 @@ config OCFS2_DEBUG_MASKLOG
           This option will enlarge your kernel, but it allows debugging of
           ocfs2 filesystem issues.
 
+config OCFS2_DEBUG_FS
+        bool "OCFS2 expensive checks"
+        depends on OCFS2_FS
+        default n
+        help
+          This option will enable expensive consistency checks. Enable
+          this option for debugging only as it is likely to decrease
+          performance of the filesystem.
+
 config MINIX_FS
         tristate "Minix fs support"
         help
@@ -504,7 +508,7 @@ config INOTIFY
           including multiple file events, one-shot support, and unmount
           notification.
 
-          For more information, see Documentation/filesystems/inotify.txt
+          For more information, see <file:Documentation/filesystems/inotify.txt>
 
           If unsure, say Y.
 
@@ -518,7 +522,7 @@ config INOTIFY_USER
           directories via a single open fd.  Events are read from the file
           descriptor, which is also select()- and poll()-able.
 
-          For more information, see Documentation/filesystems/inotify.txt
+          For more information, see <file:Documentation/filesystems/inotify.txt>
 
           If unsure, say Y.
 
@@ -1019,8 +1023,8 @@ config HUGETLB_PAGE
         def_bool HUGETLBFS
 
 config CONFIGFS_FS
-        tristate "Userspace-driven configuration filesystem (EXPERIMENTAL)"
-        depends on SYSFS && EXPERIMENTAL
+        tristate "Userspace-driven configuration filesystem"
+        depends on SYSFS
         help
           configfs is a ram-based filesystem that provides the converse
           of sysfs's functionality. Where sysfs is a filesystem-based
@@ -1089,7 +1093,7 @@ config ECRYPT_FS
         depends on EXPERIMENTAL && KEYS && CRYPTO && NET
         help
           Encrypted filesystem that operates on the VFS layer.  See
-          <file:Documentation/ecryptfs.txt> to learn more about
+          <file:Documentation/filesystems/ecryptfs.txt> to learn more about
           eCryptfs.  Userspace components are required and can be
           obtained from <http://ecryptfs.sf.net>.
 
@@ -1103,8 +1107,8 @@ config HFS_FS
         help
           If you say Y here, you will be able to mount Macintosh-formatted
           floppy disks and hard drive partitions with full read-write access.
-          Please read <file:fs/hfs/HFS.txt> to learn about the available mount
-          options.
+          Please read <file:Documentation/filesystems/hfs.txt> to learn about
+          the available mount options.
 
           To compile this file system support as a module, choose M here: the
           module will be called hfs.
@@ -1296,7 +1300,7 @@ config JFFS2_COMPRESSION_OPTIONS
         help
           Enabling this option allows you to explicitly choose which
           compression modules, if any, are enabled in JFFS2. Removing
-          compressors and mean you cannot read existing file systems,
+          compressors can mean you cannot read existing file systems,
           and enabling experimental compressors can mean that you
           write a file system which cannot be read by a standard kernel.
 
@@ -1670,6 +1674,8 @@ config NFSD
         select CRYPTO_MD5 if NFSD_V4
         select CRYPTO if NFSD_V4
         select FS_POSIX_ACL if NFSD_V4
+        select PROC_FS if NFSD_V4
+        select PROC_FS if SUNRPC_GSS
         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
@@ -1896,13 +1902,15 @@ config CIFS
           file servers such as Windows 2000 (including Windows 2003, NT 4  
           and Windows XP) as well by Samba (which provides excellent CIFS
           server support for Linux and many other operating systems). Limited
-          support for OS/2 and Windows ME and similar servers is provided as well.
-
-          The intent of the cifs module is to provide an advanced
-          network file system client for mounting to CIFS compliant servers,
-          including support for dfs (hierarchical name space), secure per-user
-          session establishment, safe distributed caching (oplock), optional
-          packet signing, Unicode and other internationalization improvements. 
+          support for OS/2 and Windows ME and similar servers is provided as
+          well.
+
+          The cifs module provides an advanced network file system
+          client for mounting to CIFS compliant servers.  It includes
+          support for DFS (hierarchical name space), secure per-user
+          session establishment via Kerberos or NTLM or NTLMv2,
+          safe distributed caching (oplock), optional packet
+          signing, Unicode and other internationalization improvements.
           If you need to mount to Samba or Windows from this machine, say Y.
 
 config CIFS_STATS
@@ -1934,7 +1942,8 @@ config CIFS_WEAK_PW_HASH
           (since 1997) support stronger NTLM (and even NTLMv2 and Kerberos)
           security mechanisms. These hash the password more securely
           than the mechanisms used in the older LANMAN version of the
-          SMB protocol needed to establish sessions with old SMB servers.
+          SMB protocol but LANMAN based authentication is needed to
+          establish sessions with some old SMB servers.
 
           Enabling this option allows the cifs module to mount to older
           LANMAN based servers such as OS/2 and Windows 95, but such
@@ -1942,8 +1951,8 @@ config CIFS_WEAK_PW_HASH
           security mechanisms if you are on a public network.  Unless you
           have a need to access old SMB servers (and are on a private 
           network) you probably want to say N.  Even if this support
-          is enabled in the kernel build, they will not be used
-          automatically. At runtime LANMAN mounts are disabled but
+          is enabled in the kernel build, LANMAN authentication will not be
+          used automatically. At runtime LANMAN mounts are disabled but
           can be set to required (or optional) either in
           /proc/fs/cifs (see fs/cifs/README for more detail) or via an
           option on the mount command. This support is disabled by 
@@ -2007,14 +2016,24 @@ config CIFS_EXPERIMENTAL
 config CIFS_UPCALL
           bool "Kerberos/SPNEGO advanced session setup (EXPERIMENTAL)"
           depends on CIFS_EXPERIMENTAL
-          depends on CONNECTOR
+          depends on KEYS
           help
-            Enables an upcall mechanism for CIFS which will be used to contact
-            userspace helper utilities to provide SPNEGO packaged Kerberos
-            tickets which are needed to mount to certain secure servers
+            Enables an upcall mechanism for CIFS which accesses
+            userspace helper utilities to provide SPNEGO packaged (RFC 4178)
+            Kerberos tickets which are needed to mount to certain secure servers
             (for which more secure Kerberos authentication is required). If
             unsure, say N.
 
+config CIFS_DFS_UPCALL
+          bool "DFS feature support (EXPERIMENTAL)"
+          depends on CIFS_EXPERIMENTAL
+          depends on KEYS
+          help
+            Enables an upcall mechanism for CIFS which contacts userspace
+            helper utilities to provide server name resolution (host names to
+            IP addresses) which is needed for implicit mounts of DFS junction
+            points. If unsure, say N.
+
 config NCP_FS
         tristate "NCP file system support (to mount NetWare volumes)"
         depends on IPX!=n || INET
@@ -2121,4 +2140,3 @@ source "fs/nls/Kconfig"
 source "fs/dlm/Kconfig"
 
 endmenu
-