From: Chuck Lever Subject: [PATCH 02/10] NFSD: Remove NFSD_TCP kernel build option Date: Tue, 05 Feb 2008 13:08:43 -0500 Message-ID: <20080205180843.32229.60646.stgit@manray.1015granger.net> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" To: linux-nfs@vger.kernel.org Return-path: Received: from flpi185.sbcis.sbc.com ([207.115.20.187]:55496 "EHLO flpi185.prodigy.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758767AbYBESIo (ORCPT ); Tue, 5 Feb 2008 13:08:44 -0500 Received: from manray.1015granger.net (adsl-76-241-169-38.dsl.sfldmi.sbcglobal.net [76.241.169.38]) by flpi185.prodigy.net (8.13.8 out.dk.spool/8.13.8) with ESMTP id m15I8hhB014956 for ; Tue, 5 Feb 2008 10:08:44 -0800 Received: from manray.1015granger.net (manray.1015granger.net [127.0.0.1]) by manray.1015granger.net (8.14.1/8.14.1) with ESMTP id m15I8hsY032260 for ; Tue, 5 Feb 2008 13:08:43 -0500 Sender: linux-nfs-owner@vger.kernel.org List-ID: 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 --- fs/Kconfig | 10 ---------- fs/nfsd/nfssvc.c | 2 -- 2 files changed, 0 insertions(+), 12 deletions(-) diff --git a/fs/Kconfig b/fs/Kconfig index 4965fd8..9c2c24b 100644 --- a/fs/Kconfig +++ b/fs/Kconfig @@ -1646,7 +1646,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 @@ -1705,15 +1704,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 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; }