mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-13 20:33:15 +00:00
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>
This commit is contained in:
parent
c0ce6ec87c
commit
5ea0dd61f2
10
fs/Kconfig
10
fs/Kconfig
@ -1696,7 +1696,6 @@ config NFSD
|
|||||||
select EXPORTFS
|
select EXPORTFS
|
||||||
select NFSD_V2_ACL if NFSD_V3_ACL
|
select NFSD_V2_ACL if NFSD_V3_ACL
|
||||||
select NFS_ACL_SUPPORT if NFSD_V2_ACL
|
select NFS_ACL_SUPPORT if NFSD_V2_ACL
|
||||||
select NFSD_TCP if NFSD_V4
|
|
||||||
select CRYPTO_MD5 if NFSD_V4
|
select CRYPTO_MD5 if NFSD_V4
|
||||||
select CRYPTO if NFSD_V4
|
select CRYPTO if NFSD_V4
|
||||||
select FS_POSIX_ACL 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.
|
should only be used if you are interested in helping to test NFSv4.
|
||||||
If unsure, say N.
|
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
|
config ROOT_NFS
|
||||||
bool "Root file system on NFS"
|
bool "Root file system on NFS"
|
||||||
depends on NFS_FS=y && IP_PNP
|
depends on NFS_FS=y && IP_PNP
|
||||||
|
@ -244,7 +244,6 @@ static int nfsd_init_socks(int port)
|
|||||||
if (error < 0)
|
if (error < 0)
|
||||||
return error;
|
return error;
|
||||||
|
|
||||||
#ifdef CONFIG_NFSD_TCP
|
|
||||||
error = lockd_up(IPPROTO_TCP);
|
error = lockd_up(IPPROTO_TCP);
|
||||||
if (error >= 0) {
|
if (error >= 0) {
|
||||||
error = svc_create_xprt(nfsd_serv, "tcp", port,
|
error = svc_create_xprt(nfsd_serv, "tcp", port,
|
||||||
@ -254,7 +253,6 @@ static int nfsd_init_socks(int port)
|
|||||||
}
|
}
|
||||||
if (error < 0)
|
if (error < 0)
|
||||||
return error;
|
return error;
|
||||||
#endif
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user