From: Trond Myklebust <trond.myklebust@primarydata.com>
Date: Mon, 17 Jun 2024 01:21:35 +0000 (-0400)
Subject: NFSv4: Ask for a delegation or an open stateid in OPEN
X-Git-Tag: v6.11-rc1~121^2~35
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d79ed371d51c57b2af74781466f1c0e821964b48;p=thirdparty%2Fkernel%2Flinux.git

NFSv4: Ask for a delegation or an open stateid in OPEN

Turn on the optimisation to allow the client to request that the server
not return the open stateid when it returns a delegation.

Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: Lance Shelton <lance.shelton@hammerspace.com>
Reviewed-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
---

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 5b18aac0b34a5..b1376571f6ef7 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -1358,6 +1358,8 @@ nfs4_map_atomic_open_share(struct nfs_server *server,
 	/* res |= NFS4_SHARE_WANT_NO_PREFERENCE; */
 	if (server->caps & NFS_CAP_DELEGTIME)
 		res |= NFS4_SHARE_WANT_DELEG_TIMESTAMPS;
+	if (server->caps & NFS_CAP_OPEN_XOR)
+		res |= NFS4_SHARE_WANT_OPEN_XOR_DELEGATION;
 out:
 	return res;
 }