1 files changed, 33 insertions, 37 deletions

diff --git a/fs/Kconfig b/fs/Kconfig
index 56c83f40cdbe..2e43d46f65d6 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -1664,30 +1664,6 @@ config NFS_V4
 
           If unsure, say N.
 
-config NFS_DIRECTIO
-        bool "Allow direct I/O on NFS files"
-        depends on NFS_FS
-        help
-          This option enables applications to perform uncached I/O on files
-          in NFS file systems using the O_DIRECT open() flag.  When O_DIRECT
-          is set for a file, its data is not cached in the system's page
-          cache.  Data is moved to and from user-level application buffers
-          directly.  Unlike local disk-based file systems, NFS O_DIRECT has
-          no alignment restrictions.
-
-          Unless your program is designed to use O_DIRECT properly, you are
-          much better off allowing the NFS client to manage data caching for
-          you.  Misusing O_DIRECT can cause poor server performance or network
-          storms.  This kernel build option defaults OFF to avoid exposing
-          system administrators unwittingly to a potentially hazardous
-          feature.
-
-          For more details on NFS O_DIRECT, see fs/nfs/direct.c.
-
-          If unsure, say N.  This reduces the size of the NFS client, and
-          causes open() to return EINVAL if a file residing in NFS is
-          opened with the O_DIRECT flag.
-
 config NFSD
         tristate "NFS server support"
         depends on INET
@@ -1813,15 +1789,33 @@ config SUNRPC_XPRT_RDMA
         tristate
         depends on SUNRPC && INFINIBAND && EXPERIMENTAL
         default SUNRPC && INFINIBAND
+        help
+          This option enables an RPC client transport capability that
+          allows the NFS client to mount servers via an RDMA-enabled
+          transport.
+
+          To compile RPC client RDMA transport support as a module,
+          choose M here: the module will be called xprtrdma.
+
+          If unsure, say N.
 
 config SUNRPC_BIND34
         bool "Support for rpcbind versions 3 & 4 (EXPERIMENTAL)"
         depends on SUNRPC && EXPERIMENTAL
+        default n
         help
-          Provides kernel support for querying rpcbind servers via versions 3
-          and 4 of the rpcbind protocol.  The kernel automatically falls back
-          to version 2 if a remote rpcbind service does not support versions
-          3 or 4.
+          RPC requests over IPv6 networks require support for larger
+          addresses when performing an RPC bind.  Sun added support for
+          IPv6 addressing by creating two new versions of the rpcbind
+          protocol (RFC 1833).
+
+          This option enables support in the kernel RPC client for
+          querying rpcbind servers via versions 3 and 4 of the rpcbind
+          protocol.  The kernel automatically falls back to version 2
+          if a remote rpcbind service does not support versions 3 or 4.
+          By themselves, these new versions do not provide support for
+          RPC over IPv6, but the new protocol versions are necessary to
+          support it.
 
           If unsure, say N to get traditional behavior (version 2 rpcbind
           requests only).
@@ -1835,12 +1829,13 @@ config RPCSEC_GSS_KRB5
         select CRYPTO_DES
         select CRYPTO_CBC
         help
-          Provides for secure RPC calls by means of a gss-api
-          mechanism based on Kerberos V5. This is required for
-          NFSv4.
+          Choose Y here to enable Secure RPC using the Kerberos version 5
+          GSS-API mechanism (RFC 1964).
 
-          Note: Requires an auxiliary userspace daemon which may be found on
-                http://www.citi.umich.edu/projects/nfsv4/
+          Secure RPC calls with Kerberos require an auxiliary user-space
+          daemon which may be found in the Linux nfs-utils package
+          available from http://linux-nfs.org/.  In addition, user-space
+          Kerberos support should be installed.
 
           If unsure, say N.
 
@@ -1854,11 +1849,12 @@ config RPCSEC_GSS_SPKM3
         select CRYPTO_CAST5
         select CRYPTO_CBC
         help
-          Provides for secure RPC calls by means of a gss-api
-          mechanism based on the SPKM3 public-key mechanism.
+          Choose Y here to enable Secure RPC using the SPKM3 public key
+          GSS-API mechansim (RFC 2025).
 
-          Note: Requires an auxiliary userspace daemon which may be found on
-                http://www.citi.umich.edu/projects/nfsv4/
+          Secure RPC calls with SPKM3 require an auxiliary userspace
+          daemon which may be found in the Linux nfs-utils package
+          available from http://linux-nfs.org/.
 
           If unsure, say N.