summarylogtreecommitdiffstats
path: root/0007-NFSv4.1-provide-mount-option-to-toggle-trunking-disc.patch
diff options
context:
space:
mode:
authorgraysky2022-04-26 17:55:58 -0400
committergraysky2022-04-26 17:55:58 -0400
commit2bbdc74d1c4f8faef5a4fc8efbd0adba08e43d77 (patch)
treefeaa397cb480f74756d89f272f27a30ffaeb8ea0 /0007-NFSv4.1-provide-mount-option-to-toggle-trunking-disc.patch
parent07e28eb0c3fa0ecd86e279565241613ad8a42c79 (diff)
downloadaur-2bbdc74d1c4f8faef5a4fc8efbd0adba08e43d77.tar.gz
Update to 5.17.5rc1-1
Diffstat (limited to '0007-NFSv4.1-provide-mount-option-to-toggle-trunking-disc.patch')
-rw-r--r--0007-NFSv4.1-provide-mount-option-to-toggle-trunking-disc.patch81
1 files changed, 81 insertions, 0 deletions
diff --git a/0007-NFSv4.1-provide-mount-option-to-toggle-trunking-disc.patch b/0007-NFSv4.1-provide-mount-option-to-toggle-trunking-disc.patch
new file mode 100644
index 000000000000..61f0f9d8d70d
--- /dev/null
+++ b/0007-NFSv4.1-provide-mount-option-to-toggle-trunking-disc.patch
@@ -0,0 +1,81 @@
+From 68ae3e7b9b621603d53fc5ce49e640b1df254a12 Mon Sep 17 00:00:00 2001
+From: Olga Kornievskaia <kolga@netapp.com>
+Date: Wed, 16 Mar 2022 18:24:26 -0400
+Subject: [PATCH 8/9] NFSv4.1 provide mount option to toggle trunking discovery
+
+Introduce a new mount option -- trunkdiscovery,notrunkdiscovery -- to
+toggle whether or not the client will engage in actively discovery
+of trunking locations.
+
+v2 make notrunkdiscovery default
+
+Signed-off-by: Olga Kornievskaia <kolga@netapp.com>
+Cherry-picked-for: https://bugs.archlinux.org/task/74272
+---
+ fs/nfs/client.c | 3 ++-
+ fs/nfs/fs_context.c | 8 ++++++++
+ include/linux/nfs_fs_sb.h | 1 +
+ 3 files changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/fs/nfs/client.c b/fs/nfs/client.c
+index d1f34229e11a..e828504cc396 100644
+--- a/fs/nfs/client.c
++++ b/fs/nfs/client.c
+@@ -857,7 +857,8 @@ static int nfs_probe_fsinfo(struct nfs_server *server, struct nfs_fh *mntfh, str
+ }
+
+ if (clp->rpc_ops->discover_trunking != NULL &&
+- (server->caps & NFS_CAP_FS_LOCATIONS)) {
++ (server->caps & NFS_CAP_FS_LOCATIONS &&
++ (server->flags & NFS_MOUNT_TRUNK_DISCOVERY))) {
+ error = clp->rpc_ops->discover_trunking(server, mntfh);
+ if (error < 0)
+ return error;
+diff --git a/fs/nfs/fs_context.c b/fs/nfs/fs_context.c
+index ea17fa1f31ec..e2d59bb5e6bb 100644
+--- a/fs/nfs/fs_context.c
++++ b/fs/nfs/fs_context.c
+@@ -80,6 +80,7 @@ enum nfs_param {
+ Opt_source,
+ Opt_tcp,
+ Opt_timeo,
++ Opt_trunkdiscovery,
+ Opt_udp,
+ Opt_v,
+ Opt_vers,
+@@ -180,6 +181,7 @@ static const struct fs_parameter_spec nfs_fs_parameters[] = {
+ fsparam_string("source", Opt_source),
+ fsparam_flag ("tcp", Opt_tcp),
+ fsparam_u32 ("timeo", Opt_timeo),
++ fsparam_flag_no("trunkdiscovery", Opt_trunkdiscovery),
+ fsparam_flag ("udp", Opt_udp),
+ fsparam_flag ("v2", Opt_v),
+ fsparam_flag ("v3", Opt_v),
+@@ -529,6 +531,12 @@ static int nfs_fs_context_parse_param(struct fs_context *fc,
+ else
+ ctx->flags &= ~NFS_MOUNT_NOCTO;
+ break;
++ case Opt_trunkdiscovery:
++ if (result.negated)
++ ctx->flags &= ~NFS_MOUNT_TRUNK_DISCOVERY;
++ else
++ ctx->flags |= NFS_MOUNT_TRUNK_DISCOVERY;
++ break;
+ case Opt_ac:
+ if (result.negated)
+ ctx->flags |= NFS_MOUNT_NOAC;
+diff --git a/include/linux/nfs_fs_sb.h b/include/linux/nfs_fs_sb.h
+index ca0959e51e81..b0e3fd550122 100644
+--- a/include/linux/nfs_fs_sb.h
++++ b/include/linux/nfs_fs_sb.h
+@@ -151,6 +151,7 @@ struct nfs_server {
+ #define NFS_MOUNT_SOFTREVAL 0x800000
+ #define NFS_MOUNT_WRITE_EAGER 0x01000000
+ #define NFS_MOUNT_WRITE_WAIT 0x02000000
++#define NFS_MOUNT_TRUNK_DISCOVERY 0x04000000
+
+ unsigned int fattr_valid; /* Valid attributes */
+ unsigned int caps; /* server capabilities */
+--
+2.36.0
+