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>

diff --git a/fs/Kconfig b/fs/Kconfig
index 8b18a875867751cc9a95bdf85a9f6f9935b6b68d..12002775d299bbb70a6445e0764095811240bc0c 100644 (file)
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -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
@@ -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

diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c
index 9647b0f7bc0c0d52610bf1419c9bafcd466b57dc..941041f4b1365fb72f77558aa93b376f9d5818fb 100644 (file)
--- 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;
 }