[PATCH] knfsd: mark NFS/TCP server not EXPERIMENTAL

From: Greg Banks <gnb@sgi.com>

NFS/TCP has been used widely for a long time now, and is now enabled by many
distros and typically recommended for lossy or congested networks.  This patch
removes the EXPERIMENTAL tag, updates the help text, and changes arch
defconfigs to set it by default (note that several already did so).

Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/arch/alpha/defconfig b/arch/alpha/defconfig
index 3632f72edc54ff938ed685722324387277363da0..99a3843cd4a08cb81314ff8a3a3659ef1b15b18e 100644 (file)
--- a/arch/alpha/defconfig
+++ b/arch/alpha/defconfig
@@ -791,7 +791,7 @@ CONFIG_NFS_V3=y
 CONFIG_NFSD=m
 CONFIG_NFSD_V3=y
 # CONFIG_NFSD_V4 is not set
-# CONFIG_NFSD_TCP is not set
+CONFIG_NFSD_TCP=y
 CONFIG_LOCKD=m
 CONFIG_LOCKD_V4=y
 CONFIG_EXPORTFS=m

diff --git a/arch/i386/defconfig b/arch/i386/defconfig
index 7257696c7a963abc8039b378d83ca619e3705fb2..aed3bc29823278f5e9f981b9a13c79bb5716168f 100644 (file)
--- a/arch/i386/defconfig
+++ b/arch/i386/defconfig
@@ -1148,7 +1148,7 @@ CONFIG_NFS_FS=y
 # CONFIG_NFS_DIRECTIO is not set
 CONFIG_NFSD=y
 # CONFIG_NFSD_V3 is not set
-# CONFIG_NFSD_TCP is not set
+CONFIG_NFSD_TCP=y
 CONFIG_LOCKD=y
 CONFIG_EXPORTFS=y
 CONFIG_SUNRPC=y

diff --git a/arch/ia64/defconfig b/arch/ia64/defconfig
index 426eb10794becc8b02fb9495d0d560c7c681291c..05055156eb5698f591eae0002430ce21309d740a 100644 (file)
--- a/arch/ia64/defconfig
+++ b/arch/ia64/defconfig
@@ -999,7 +999,7 @@ CONFIG_NFS_DIRECTIO=y
 CONFIG_NFSD=y
 CONFIG_NFSD_V3=y
 # CONFIG_NFSD_V4 is not set
-# CONFIG_NFSD_TCP is not set
+CONFIG_NFSD_TCP=y
 CONFIG_LOCKD=y
 CONFIG_LOCKD_V4=y
 CONFIG_EXPORTFS=y

diff --git a/arch/ppc/defconfig b/arch/ppc/defconfig
index 9cf908e2ff233f799103b12b2c9751200ef6b877..b934ad9eadcf9f62b53d3eb6f72a5be9f211ed3d 100644 (file)
--- a/arch/ppc/defconfig
+++ b/arch/ppc/defconfig
@@ -1230,7 +1230,7 @@ CONFIG_NFS_V3=y
 CONFIG_NFSD=y
 CONFIG_NFSD_V3=y
 # CONFIG_NFSD_V4 is not set
-# CONFIG_NFSD_TCP is not set
+CONFIG_NFSD_TCP=y
 CONFIG_LOCKD=y
 CONFIG_LOCKD_V4=y
 CONFIG_EXPORTFS=y

diff --git a/arch/s390/defconfig b/arch/s390/defconfig
index c694ae54398377bdcffc0909f6ead2aad7d96047..d258019e54f3a978372c341851cb4b8d17f5b69e 100644 (file)
--- a/arch/s390/defconfig
+++ b/arch/s390/defconfig
@@ -422,7 +422,7 @@ CONFIG_NFS_V3=y
 CONFIG_NFSD=y
 CONFIG_NFSD_V3=y
 # CONFIG_NFSD_V4 is not set
-# CONFIG_NFSD_TCP is not set
+CONFIG_NFSD_TCP=y
 CONFIG_LOCKD=y
 CONFIG_LOCKD_V4=y
 CONFIG_EXPORTFS=y

diff --git a/fs/Kconfig b/fs/Kconfig
index f0502fffa128f717afcf68fe0ddad12116bff967..55d99d885c03eeb3cff2e4d70e7417494db7dec0 100644 (file)
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -1469,11 +1469,13 @@ config NFSD_V4
          If unsure, say N.
 
 config NFSD_TCP
-       bool "Provide NFS server over TCP support (EXPERIMENTAL)"
-       depends on NFSD && EXPERIMENTAL
+       bool "Provide NFS server over TCP support"
+       depends on NFSD
+       default y
        help
-         Enable NFS service over TCP connections.  This the officially
-         still experimental, but seems to work well.
+         If you want your NFS server to support TCP connections, say Y here.
+         TCP connections usually perform better than the default UDP when
+         the network is lossy or congested.  If unsure, say Y.
 
 config ROOT_NFS
        bool "Root file system on NFS"