1 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2 From: Olga Kornievskaia <kolga@netapp.com>
3 Date: Wed, 16 Mar 2022 18:24:26 -0400
4 Subject: [PATCH] NFSv4.1 provide mount option to toggle trunking discovery
6 Introduce a new mount option -- trunkdiscovery,notrunkdiscovery -- to
7 toggle whether or not the client will engage in actively discovery
10 v2 make notrunkdiscovery default
12 Signed-off-by: Olga Kornievskaia <kolga@netapp.com>
13 Fixes: 1976b2b31462 ("NFSv4.1 query for fs_location attr on a new file system")
14 Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
15 (cherry picked from commit a43bf604446414103b7535f38e739b65601c4fb2)
16 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
18 fs/nfs/client.c | 3 ++-
19 fs/nfs/fs_context.c | 8 ++++++++
20 include/linux/nfs_fs_sb.h | 1 +
21 3 files changed, 11 insertions(+), 1 deletion(-)
23 diff --git a/fs/nfs/client.c b/fs/nfs/client.c
24 index 090b16890e3d..f303e96ce165 100644
27 @@ -861,7 +861,8 @@ int nfs_probe_fsinfo(struct nfs_server *server, struct nfs_fh *mntfh, struct nfs
30 if (clp->rpc_ops->discover_trunking != NULL &&
31 - (server->caps & NFS_CAP_FS_LOCATIONS)) {
32 + (server->caps & NFS_CAP_FS_LOCATIONS &&
33 + (server->flags & NFS_MOUNT_TRUNK_DISCOVERY))) {
34 error = clp->rpc_ops->discover_trunking(server, mntfh);
37 diff --git a/fs/nfs/fs_context.c b/fs/nfs/fs_context.c
38 index 0d444a90f513..da5217abc2e5 100644
39 --- a/fs/nfs/fs_context.c
40 +++ b/fs/nfs/fs_context.c
41 @@ -79,6 +79,7 @@ enum nfs_param {
49 @@ -179,6 +180,7 @@ static const struct fs_parameter_spec nfs_fs_parameters[] = {
50 fsparam_string("source", Opt_source),
51 fsparam_flag ("tcp", Opt_tcp),
52 fsparam_u32 ("timeo", Opt_timeo),
53 + fsparam_flag_no("trunkdiscovery", Opt_trunkdiscovery),
54 fsparam_flag ("udp", Opt_udp),
55 fsparam_flag ("v2", Opt_v),
56 fsparam_flag ("v3", Opt_v),
57 @@ -528,6 +530,12 @@ static int nfs_fs_context_parse_param(struct fs_context *fc,
59 ctx->flags &= ~NFS_MOUNT_NOCTO;
61 + case Opt_trunkdiscovery:
63 + ctx->flags &= ~NFS_MOUNT_TRUNK_DISCOVERY;
65 + ctx->flags |= NFS_MOUNT_TRUNK_DISCOVERY;
69 ctx->flags |= NFS_MOUNT_NOAC;
70 diff --git a/include/linux/nfs_fs_sb.h b/include/linux/nfs_fs_sb.h
71 index 9a6e70ccde56..10c347416dd2 100644
72 --- a/include/linux/nfs_fs_sb.h
73 +++ b/include/linux/nfs_fs_sb.h
74 @@ -156,6 +156,7 @@ struct nfs_server {
75 #define NFS_MOUNT_SOFTREVAL 0x800000
76 #define NFS_MOUNT_WRITE_EAGER 0x01000000
77 #define NFS_MOUNT_WRITE_WAIT 0x02000000
78 +#define NFS_MOUNT_TRUNK_DISCOVERY 0x04000000
80 unsigned int fattr_valid; /* Valid attributes */
81 unsigned int caps; /* server capabilities */