# This is a BitKeeper generated diff -Nru style patch. # # ChangeSet # 2004/08/16 19:37:23-03:00 neilb@cse.unsw.edu.au # [PATCH] mark NFS/TCP not EXPERIMENTAL # # 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). # # From: Greg Banks # Signed-off-by: Neil Brown # # ### Diffstat output # ./Documentation/Configure.help | 7 ++++--- # ./arch/i386/defconfig | 2 +- # ./arch/ia64/defconfig | 2 +- # ./arch/mips/defconfig | 2 +- # ./arch/mips64/defconfig | 2 +- # ./arch/ppc/defconfig | 2 +- # ./arch/ppc64/defconfig | 2 +- # ./arch/s390/defconfig | 2 +- # ./arch/s390x/defconfig | 2 +- # ./arch/sh64/defconfig | 2 +- # ./fs/Config.in | 2 +- # 11 files changed, 14 insertions(+), 13 deletions(-) # # Documentation/Configure.help # 2004/08/15 20:53:43-03:00 neilb@cse.unsw.edu.au +4 -3 # mark NFS/TCP not EXPERIMENTAL # # arch/i386/defconfig # 2004/08/15 20:53:43-03:00 neilb@cse.unsw.edu.au +1 -1 # mark NFS/TCP not EXPERIMENTAL # # arch/ia64/defconfig # 2004/08/15 20:53:43-03:00 neilb@cse.unsw.edu.au +1 -1 # mark NFS/TCP not EXPERIMENTAL # # arch/mips/defconfig # 2004/08/15 20:53:43-03:00 neilb@cse.unsw.edu.au +1 -1 # mark NFS/TCP not EXPERIMENTAL # # arch/mips64/defconfig # 2004/08/15 20:53:43-03:00 neilb@cse.unsw.edu.au +1 -1 # mark NFS/TCP not EXPERIMENTAL # # arch/ppc/defconfig # 2004/08/15 20:53:43-03:00 neilb@cse.unsw.edu.au +1 -1 # mark NFS/TCP not EXPERIMENTAL # # arch/ppc64/defconfig # 2004/08/15 20:53:43-03:00 neilb@cse.unsw.edu.au +1 -1 # mark NFS/TCP not EXPERIMENTAL # # arch/s390/defconfig # 2004/08/15 20:53:43-03:00 neilb@cse.unsw.edu.au +1 -1 # mark NFS/TCP not EXPERIMENTAL # # arch/s390x/defconfig # 2004/08/15 20:53:43-03:00 neilb@cse.unsw.edu.au +1 -1 # mark NFS/TCP not EXPERIMENTAL # # arch/sh64/defconfig # 2004/08/15 20:53:43-03:00 neilb@cse.unsw.edu.au +1 -1 # mark NFS/TCP not EXPERIMENTAL # # fs/Config.in # 2004/08/15 20:53:43-03:00 neilb@cse.unsw.edu.au +1 -1 # mark NFS/TCP not EXPERIMENTAL # diff -Nru a/Documentation/Configure.help b/Documentation/Configure.help --- a/Documentation/Configure.help 2004-08-19 14:43:23 -07:00 +++ b/Documentation/Configure.help 2004-08-19 14:43:23 -07:00 @@ -17272,10 +17272,11 @@ If you would like to include the NFSv3 server as well as the NFSv2 server, say Y here. If unsure, say Y. -Provide NFS over TCP server support EXPERIMENTAL +Provide NFS over TCP server support CONFIG_NFSD_TCP - 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. OS/2 HPFS file system support CONFIG_HPFS_FS diff -Nru a/arch/i386/defconfig b/arch/i386/defconfig --- a/arch/i386/defconfig 2004-08-19 14:43:23 -07:00 +++ b/arch/i386/defconfig 2004-08-19 14:43:23 -07:00 @@ -758,7 +758,7 @@ # CONFIG_ROOT_NFS is not set CONFIG_NFSD=y # CONFIG_NFSD_V3 is not set -# CONFIG_NFSD_TCP is not set +CONFIG_NFSD_TCP=y CONFIG_SUNRPC=y CONFIG_LOCKD=y # CONFIG_SMB_FS is not set diff -Nru a/arch/ia64/defconfig b/arch/ia64/defconfig --- a/arch/ia64/defconfig 2004-08-19 14:43:23 -07:00 +++ b/arch/ia64/defconfig 2004-08-19 14:43:23 -07:00 @@ -755,7 +755,7 @@ # CONFIG_ROOT_NFS is not set CONFIG_NFSD=y CONFIG_NFSD_V3=y -# CONFIG_NFSD_TCP is not set +CONFIG_NFSD_TCP=y CONFIG_SUNRPC=y CONFIG_LOCKD=y CONFIG_LOCKD_V4=y diff -Nru a/arch/mips/defconfig b/arch/mips/defconfig --- a/arch/mips/defconfig 2004-08-19 14:43:23 -07:00 +++ b/arch/mips/defconfig 2004-08-19 14:43:23 -07:00 @@ -607,7 +607,7 @@ CONFIG_ROOT_NFS=y CONFIG_NFSD=y # CONFIG_NFSD_V3 is not set -# CONFIG_NFSD_TCP is not set +CONFIG_NFSD_TCP=y CONFIG_SUNRPC=y CONFIG_LOCKD=y # CONFIG_SMB_FS is not set diff -Nru a/arch/mips64/defconfig b/arch/mips64/defconfig --- a/arch/mips64/defconfig 2004-08-19 14:43:23 -07:00 +++ b/arch/mips64/defconfig 2004-08-19 14:43:23 -07:00 @@ -563,7 +563,7 @@ CONFIG_ROOT_NFS=y # CONFIG_NFSD is not set # CONFIG_NFSD_V3 is not set -# CONFIG_NFSD_TCP is not set +CONFIG_NFSD_TCP=y CONFIG_SUNRPC=y CONFIG_LOCKD=y CONFIG_LOCKD_V4=y diff -Nru a/arch/ppc/defconfig b/arch/ppc/defconfig --- a/arch/ppc/defconfig 2004-08-19 14:43:23 -07:00 +++ b/arch/ppc/defconfig 2004-08-19 14:43:23 -07:00 @@ -812,7 +812,7 @@ # CONFIG_ROOT_NFS is not set CONFIG_NFSD=y # CONFIG_NFSD_V3 is not set -# CONFIG_NFSD_TCP is not set +CONFIG_NFSD_TCP=y CONFIG_SUNRPC=y CONFIG_LOCKD=y # CONFIG_SMB_FS is not set diff -Nru a/arch/ppc64/defconfig b/arch/ppc64/defconfig --- a/arch/ppc64/defconfig 2004-08-19 14:43:23 -07:00 +++ b/arch/ppc64/defconfig 2004-08-19 14:43:23 -07:00 @@ -668,7 +668,7 @@ # CONFIG_ROOT_NFS is not set CONFIG_NFSD=y CONFIG_NFSD_V3=y -# CONFIG_NFSD_TCP is not set +CONFIG_NFSD_TCP=y CONFIG_SUNRPC=y CONFIG_LOCKD=y CONFIG_LOCKD_V4=y diff -Nru a/arch/s390/defconfig b/arch/s390/defconfig --- a/arch/s390/defconfig 2004-08-19 14:43:23 -07:00 +++ b/arch/s390/defconfig 2004-08-19 14:43:23 -07:00 @@ -351,7 +351,7 @@ # CONFIG_ROOT_NFS is not set CONFIG_NFSD=y CONFIG_NFSD_V3=y -# CONFIG_NFSD_TCP is not set +CONFIG_NFSD_TCP=y CONFIG_SUNRPC=y CONFIG_LOCKD=y CONFIG_LOCKD_V4=y diff -Nru a/arch/s390x/defconfig b/arch/s390x/defconfig --- a/arch/s390x/defconfig 2004-08-19 14:43:23 -07:00 +++ b/arch/s390x/defconfig 2004-08-19 14:43:23 -07:00 @@ -291,7 +291,7 @@ # CONFIG_ROOT_NFS is not set CONFIG_NFSD=y CONFIG_NFSD_V3=y -# CONFIG_NFSD_TCP is not set +CONFIG_NFSD_TCP=y CONFIG_SUNRPC=y CONFIG_LOCKD=y CONFIG_LOCKD_V4=y diff -Nru a/arch/sh64/defconfig b/arch/sh64/defconfig --- a/arch/sh64/defconfig 2004-08-19 14:43:23 -07:00 +++ b/arch/sh64/defconfig 2004-08-19 14:43:23 -07:00 @@ -386,7 +386,7 @@ CONFIG_ROOT_NFS=y # CONFIG_NFSD is not set # CONFIG_NFSD_V3 is not set -# CONFIG_NFSD_TCP is not set +CONFIG_NFSD_TCP=y CONFIG_SUNRPC=y CONFIG_LOCKD=y CONFIG_LOCKD_V4=y diff -Nru a/fs/Config.in b/fs/Config.in --- a/fs/Config.in 2004-08-19 14:43:23 -07:00 +++ b/fs/Config.in 2004-08-19 14:43:23 -07:00 @@ -121,7 +121,7 @@ dep_tristate 'NFS server support' CONFIG_NFSD $CONFIG_INET dep_mbool ' Provide NFSv3 server support' CONFIG_NFSD_V3 $CONFIG_NFSD - dep_mbool ' Provide NFS server over TCP support (EXPERIMENTAL)' CONFIG_NFSD_TCP $CONFIG_NFSD $CONFIG_EXPERIMENTAL + dep_mbool ' Provide NFS server over TCP support' CONFIG_NFSD_TCP $CONFIG_NFSD if [ "$CONFIG_NFS_FS" = "y" -o "$CONFIG_NFSD" = "y" ]; then define_tristate CONFIG_SUNRPC y