summaryrefslogtreecommitdiffstats
path: root/fs/nfsd
diff options
context:
space:
mode:
authorChuck Lever <chuck.lever@oracle.com>2008-02-11 17:11:39 -0500
committerJ. Bruce Fields <bfields@citi.umich.edu>2008-04-23 16:13:38 -0400
commit5ea0dd61f221ba2701314a85e998b8202412553d (patch)
tree1f1d1f2bea5fd98cc06af8d070242bdfd1ddd87b /fs/nfsd
parentc0ce6ec87c59d7a29438717b1f72f83fb408f416 (diff)
downloadlinux-stable-5ea0dd61f221ba2701314a85e998b8202412553d.tar.gz
linux-stable-5ea0dd61f221ba2701314a85e998b8202412553d.tar.bz2
linux-stable-5ea0dd61f221ba2701314a85e998b8202412553d.zip
NFSD: Remove NFSD_TCP kernel build option
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>
Diffstat (limited to 'fs/nfsd')
-rw-r--r--fs/nfsd/nfssvc.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c
index 9647b0f7bc0c..941041f4b136 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;
}