75 lines
2.7 KiB
Diff
75 lines
2.7 KiB
Diff
From 26d356ebfcd275f01c22349404676755dd36a4c4 Mon Sep 17 00:00:00 2001
|
|
From: Chuck Lever <chuck.lever@oracle.com>
|
|
Date: Tue, 11 Mar 2025 23:06:38 -0400
|
|
Subject: NFSD: Add a Kconfig setting to enable delegated timestamps
|
|
|
|
After three tries, we still see test failures with delegated
|
|
timestamps. Disable them by default, but leave the implementation
|
|
intact so that development can continue.
|
|
|
|
Cc: stable@vger.kernel.org # v6.14
|
|
Reviewed-by: Jeff Layton <jlayton@kernel.org>
|
|
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
|
|
---
|
|
fs/nfsd/Kconfig | 12 +++++++++++-
|
|
fs/nfsd/nfs4state.c | 16 ++++++++++++++--
|
|
2 files changed, 25 insertions(+), 3 deletions(-)
|
|
|
|
--- a/fs/nfsd/Kconfig
|
|
+++ b/fs/nfsd/Kconfig
|
|
@@ -172,6 +172,16 @@ config NFSD_LEGACY_CLIENT_TRACKING
|
|
recoverydir, or spawn a process directly using a usermodehelper
|
|
upcall.
|
|
|
|
- These legacy client tracking methods have proven to be probelmatic
|
|
+ These legacy client tracking methods have proven to be problematic
|
|
and will be removed in the future. Say Y here if you need support
|
|
for them in the interim.
|
|
+
|
|
+config NFSD_V4_DELEG_TIMESTAMPS
|
|
+ bool "Support delegated timestamps"
|
|
+ depends on NFSD_V4
|
|
+ default n
|
|
+ help
|
|
+ NFSD implements delegated timestamps according to
|
|
+ draft-ietf-nfsv4-delstid-08 "Extending the Opening of Files". This
|
|
+ is currently an experimental feature and is therefore left disabled
|
|
+ by default.
|
|
--- a/fs/nfsd/nfs4state.c
|
|
+++ b/fs/nfsd/nfs4state.c
|
|
@@ -5958,11 +5958,23 @@ nfsd4_verify_setuid_write(struct nfsd4_o
|
|
return 0;
|
|
}
|
|
|
|
+#ifdef CONFIG_NFSD_V4_DELEG_TIMESTAMPS
|
|
+static bool nfsd4_want_deleg_timestamps(const struct nfsd4_open *open)
|
|
+{
|
|
+ return open->op_deleg_want & OPEN4_SHARE_ACCESS_WANT_DELEG_TIMESTAMPS;
|
|
+}
|
|
+#else /* CONFIG_NFSD_V4_DELEG_TIMESTAMPS */
|
|
+static bool nfsd4_want_deleg_timestamps(const struct nfsd4_open *open)
|
|
+{
|
|
+ return false;
|
|
+}
|
|
+#endif /* CONFIG NFSD_V4_DELEG_TIMESTAMPS */
|
|
+
|
|
static struct nfs4_delegation *
|
|
nfs4_set_delegation(struct nfsd4_open *open, struct nfs4_ol_stateid *stp,
|
|
struct svc_fh *parent)
|
|
{
|
|
- bool deleg_ts = open->op_deleg_want & OPEN4_SHARE_ACCESS_WANT_DELEG_TIMESTAMPS;
|
|
+ bool deleg_ts = nfsd4_want_deleg_timestamps(open);
|
|
struct nfs4_client *clp = stp->st_stid.sc_client;
|
|
struct nfs4_file *fp = stp->st_stid.sc_file;
|
|
struct nfs4_clnt_odstate *odstate = stp->st_clnt_odstate;
|
|
@@ -6161,8 +6173,8 @@ static void
|
|
nfs4_open_delegation(struct nfsd4_open *open, struct nfs4_ol_stateid *stp,
|
|
struct svc_fh *currentfh)
|
|
{
|
|
- bool deleg_ts = open->op_deleg_want & OPEN4_SHARE_ACCESS_WANT_DELEG_TIMESTAMPS;
|
|
struct nfs4_openowner *oo = openowner(stp->st_stateowner);
|
|
+ bool deleg_ts = nfsd4_want_deleg_timestamps(open);
|
|
struct nfs4_client *clp = stp->st_stid.sc_client;
|
|
struct svc_fh *parent = NULL;
|
|
struct nfs4_delegation *dp;
|