TCP support in the Linux NFS server is stable enough that we can leave it
on always. CONFIG_NFSD_TCP adds about 10 lines of code, and defaults to
"Y" anyway.
A run-time switch might be more appropriate if people feel they would like
to disable NFSD's TCP support.
Signed-off-by: Chuck Lever <[email protected]>
---
fs/Kconfig | 10 ----------
fs/nfsd/nfssvc.c | 2 --
2 files changed, 0 insertions(+), 12 deletions(-)
diff --git a/fs/Kconfig b/fs/Kconfig
index e6d4034..5ccff9a 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -1686,7 +1686,6 @@ config NFSD
select EXPORTFS
select NFSD_V2_ACL if NFSD_V3_ACL
select NFS_ACL_SUPPORT if NFSD_V2_ACL
- select NFSD_TCP if NFSD_V4
select CRYPTO_MD5 if NFSD_V4
select CRYPTO if NFSD_V4
select FS_POSIX_ACL if NFSD_V4
@@ -1763,15 +1762,6 @@ config NFSD_V4
If unsure, say N.
-config NFSD_TCP
- bool "Provide NFS server over TCP support"
- depends on NFSD
- default y
- help
- 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 LOCKD
tristate
diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c
index 9647b0f..941041f 100644
--- a/fs/nfsd/nfssvc.c
+++ b/fs/nfsd/nfssvc.c
@@ -244,7 +244,6 @@ static int nfsd_init_socks(int port)
if (error < 0)
return error;
-#ifdef CONFIG_NFSD_TCP
error = lockd_up(IPPROTO_TCP);
if (error >= 0) {
error = svc_create_xprt(nfsd_serv, "tcp", port,
@@ -254,7 +253,6 @@ static int nfsd_init_socks(int port)
}
if (error < 0)
return error;
-#endif
return 0;
}
Chuck Lever wrote:
> TCP support in the Linux NFS server is stable enough that we can leave it
> on always. CONFIG_NFSD_TCP adds about 10 lines of code, and defaults to
> "Y" anyway.
>
> A run-time switch might be more appropriate if people feel they would like
> to disable NFSD's TCP support.
>
>
Looks good.
Actually, I'd be inclined to go one step further and set UDP support
off by default.
--
Greg Banks, R&D Software Engineer, SGI Australian Software Group.
The cake is *not* a lie.
I don't speak for SGI.
On Tue, 2008-02-05 at 11:19 +1100, Greg Banks wrote:
> Chuck Lever wrote:
> > TCP support in the Linux NFS server is stable enough that we can leave it
> > on always. CONFIG_NFSD_TCP adds about 10 lines of code, and defaults to
> > "Y" anyway.
> >
> > A run-time switch might be more appropriate if people feel they would like
> > to disable NFSD's TCP support.
> >
> >
> Looks good.
>
> Actually, I'd be inclined to go one step further and set UDP support
> off by default.
That will break older clients.
Trond Myklebust wrote:
> On Tue, 2008-02-05 at 11:19 +1100, Greg Banks wrote:
>
>> Chuck Lever wrote:
>>
>>> TCP support in the Linux NFS server is stable enough that we can leave it
>>> on always. CONFIG_NFSD_TCP adds about 10 lines of code, and defaults to
>>> "Y" anyway.
>>>
>>> A run-time switch might be more appropriate if people feel they would like
>>> to disable NFSD's TCP support.
>>>
>>>
>>>
>> Looks good.
>>
>> Actually, I'd be inclined to go one step further and set UDP support
>> off by default.
>>
>
> That will break older clients.
>
>
Hence the default, rather than removing the code entirely.
--
Greg Banks, R&D Software Engineer, SGI Australian Software Group.
The cake is *not* a lie.
I don't speak for SGI.