summaryrefslogtreecommitdiffstats
path: root/fs/nfs/client.c
diff options
context:
space:
mode:
authorTrond Myklebust <trond.myklebust@hammerspace.com>2021-03-30 15:01:50 +0200
committerTrond Myklebust <trond.myklebust@hammerspace.com>2021-04-05 15:04:20 +0200
commit90ff57bf4df2825ace0f61befdc3f87c79838ec2 (patch)
treed4f267dfbc323e3da3682037c6064c0637297de4 /fs/nfs/client.c
parentnfs: Fix a typo in the file nfs42xattr.c (diff)
downloadlinux-90ff57bf4df2825ace0f61befdc3f87c79838ec2.tar.xz
linux-90ff57bf4df2825ace0f61befdc3f87c79838ec2.zip
NFS: Fix up the support for CONFIG_NFS_DISABLE_UDP_SUPPORT
Rather than removing the support in nfs_init_timeout_values(), we should just fix up the validation checks in the mount option parsers. Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Diffstat (limited to 'fs/nfs/client.c')
-rw-r--r--fs/nfs/client.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/nfs/client.c b/fs/nfs/client.c
index ff5c4d0d6d13..399a8eb15397 100644
--- a/fs/nfs/client.c
+++ b/fs/nfs/client.c
@@ -476,7 +476,6 @@ void nfs_init_timeout_values(struct rpc_timeout *to, int proto,
to->to_maxval = to->to_initval;
to->to_exponential = 0;
break;
-#ifndef CONFIG_NFS_DISABLE_UDP_SUPPORT
case XPRT_TRANSPORT_UDP:
if (retrans == NFS_UNSPEC_RETRANS)
to->to_retries = NFS_DEF_UDP_RETRANS;
@@ -487,7 +486,6 @@ void nfs_init_timeout_values(struct rpc_timeout *to, int proto,
to->to_maxval = NFS_MAX_UDP_TIMEOUT;
to->to_exponential = 1;
break;
-#endif
default:
BUG();
}