Now that there is a runtime debugfs switch, eliminate the compile-time
switch and always build in support for delegated timestamps.
Administrators who previously disabled this feature at compile time can
disable it at runtime via:
echo 0 > /sys/kernel/debug/nfsd/delegated_timestamps
Signed-off-by: Jeff Layton <jlayton@kernel.org>
---
fs/nfsd/Kconfig | 10 ----------
fs/nfsd/nfs4state.c | 7 -------
2 files changed, 17 deletions(-)
diff --git a/fs/nfsd/Kconfig b/fs/nfsd/Kconfig
index 4fd6e818565ea24e4e16844a3f82e808dbc558f8..fc0e87eaa25714d621aa893c99dabe4ce34228df 100644
--- a/fs/nfsd/Kconfig
+++ b/fs/nfsd/Kconfig
@@ -177,16 +177,6 @@ config NFSD_LEGACY_CLIENT_TRACKING
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.
-
config NFSD_V4_POSIX_ACLS
bool "Support NFSv4 POSIX draft ACLs"
depends on NFSD_V4
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index 2251ff43aac8ef8a3d01d7094d40f9b2604763d6..f105ca19815f97c1dd042bbf9a543c1cc3551282 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -6047,7 +6047,6 @@ nfsd4_verify_setuid_write(struct nfsd4_open *open, struct nfsd_file *nf)
return 0;
}
-#ifdef CONFIG_NFSD_V4_DELEG_TIMESTAMPS
/*
* Timestamp delegation was introduced in RFC7862. Runtime switch for disabling
* this feature is /sys/kernel/debug/nfsd/delegated_timestamps.
@@ -6058,12 +6057,6 @@ static bool nfsd4_want_deleg_timestamps(const struct nfsd4_open *open)
return false;
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,
--
2.52.0