summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@redhat.com>2014-09-15 11:05:46 -0400
committerJ. Bruce Fields <bfields@redhat.com>2014-09-17 16:33:18 -0400
commitbea57fe45ba23995dcf954e66d29625944a1d039 (patch)
treebcdee3f287ae3cdcacf4412df718a8ed5cc4c38f
parent65decb650a95b00301e7ea1b75a65d64c52132c7 (diff)
downloadlinux-bea57fe45ba23995dcf954e66d29625944a1d039.tar.bz2
nfsd4: stop grace_time update at end of grace period
The attempt to automatically set a new grace period time at the end of the grace period isn't really helpful. We'll probably shut down and reboot before we actually make use of the new grace period time anyway. So may as well leave it up to the init system to get this right. This just confuses people when they see /proc/fs/nfsd/nfsv4gracetime change from what they set it to. Signed-off-by: J. Bruce Fields <bfields@redhat.com>
-rw-r--r--fs/nfsd/nfs4state.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index fc88b57516b2..a298c3d62ba6 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -4124,12 +4124,6 @@ nfsd4_end_grace(struct nfsd_net *nn)
nn->grace_ended = true;
nfsd4_record_grace_done(nn);
locks_end_grace(&nn->nfsd4_manager);
- /*
- * Now that every NFSv4 client has had the chance to recover and
- * to see the (possibly new, possibly shorter) lease time, we
- * can safely set the next grace time to the current lease time:
- */
- nn->nfsd4_grace = nn->nfsd4_lease;
}
static time_t