Skip to content

Commit

Permalink
NFSD: Remove NFSD_TCP kernel build option
Browse files Browse the repository at this point in the history
Likewise, distros usually leave CONFIG_NFSD_TCP enabled.

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.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
  • Loading branch information
Chuck Lever authored and J. Bruce Fields committed Apr 23, 2008
1 parent c0ce6ec commit 5ea0dd6
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 12 deletions.
10 changes: 0 additions & 10 deletions fs/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -1696,7 +1696,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
Expand Down Expand Up @@ -1755,15 +1754,6 @@ config NFSD_V4
should only be used if you are interested in helping to test NFSv4.
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 ROOT_NFS
bool "Root file system on NFS"
depends on NFS_FS=y && IP_PNP
Expand Down
2 changes: 0 additions & 2 deletions fs/nfsd/nfssvc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -254,7 +253,6 @@ static int nfsd_init_socks(int port)
}
if (error < 0)
return error;
#endif
return 0;
}

Expand Down

0 comments on commit 5ea0dd6

Please sign in to comment.