aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/nfsd/nfs4state.c12
-rw-r--r--fs/nfsd/nfsctl.c2
2 files changed, 1 insertions, 13 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index eb8d124ec14d..4471046e19e0 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -4115,15 +4115,3 @@ nfs4_recoverydir(void)
4115{ 4115{
4116 return user_recovery_dirname; 4116 return user_recovery_dirname;
4117} 4117}
4118
4119/*
4120 * Called when leasetime is changed.
4121 *
4122 * nfsd4_lease is protected by nfsd_mutex since it's only really accessed
4123 * when nfsd is starting
4124 */
4125void
4126nfs4_reset_lease(time_t leasetime)
4127{
4128 nfsd4_lease = leasetime;
4129}
diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c
index 8bff6741b1e6..6738e9d8a83d 100644
--- a/fs/nfsd/nfsctl.c
+++ b/fs/nfsd/nfsctl.c
@@ -1219,7 +1219,7 @@ static ssize_t __write_leasetime(struct file *file, char *buf, size_t size)
1219 return rv; 1219 return rv;
1220 if (lease < 10 || lease > 3600) 1220 if (lease < 10 || lease > 3600)
1221 return -EINVAL; 1221 return -EINVAL;
1222 nfs4_reset_lease(lease); 1222 nfsd4_lease = lease;
1223 } 1223 }
1224 1224
1225 return scnprintf(buf, SIMPLE_TRANSACTION_LIMIT, "%ld\n", nfsd4_lease); 1225 return scnprintf(buf, SIMPLE_TRANSACTION_LIMIT, "%ld\n", nfsd4_lease);