nfsd: common grace period control

Rewrite grace period code to unify management of grace period across
lockd and nfsd.  The current code has lockd and nfsd cooperate to
compute a grace period which is satisfactory to them both, and then
individually enforce it.  This creates a slight race condition, since
the enforcement is not coordinated.  It's also more complicated than
necessary.

Here instead we have lockd and nfsd each inform common code when they
enter the grace period, and when they're ready to leave the grace
period, and allow normal locking only after both of them are ready to
leave.

We also expect the locks_start_grace()/locks_end_grace() interface here
to be simpler to build on for future cluster/high-availability work,
which may require (for example) putting individual filesystems into
grace, or enforcing grace periods across multiple cluster nodes.

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>

1 files changed, 6 insertions, 6 deletions

diff --git a/fs/lockd/svc4proc.c b/fs/lockd/svc4proc.c
index 4a714f64515..7ca617367b3 100644
--- a/fs/lockd/svc4proc.c
+++ b/fs/lockd/svc4proc.c
@@ -89,7 +89,7 @@ nlm4svc_proc_test(struct svc_rqst *rqstp, struct nlm_args *argp,
         resp->cookie = argp->cookie;
 
         /* Don't accept test requests during grace period */
-        if (nlmsvc_grace_period) {
+        if (locks_in_grace()) {
                 resp->status = nlm_lck_denied_grace_period;
                 return rc;
         }
@@ -123,7 +123,7 @@ nlm4svc_proc_lock(struct svc_rqst *rqstp, struct nlm_args *argp,
         resp->cookie = argp->cookie;
 
         /* Don't accept new lock requests during grace period */
-        if (nlmsvc_grace_period && !argp->reclaim) {
+        if (locks_in_grace() && !argp->reclaim) {
                 resp->status = nlm_lck_denied_grace_period;
                 return rc;
         }
@@ -169,7 +169,7 @@ nlm4svc_proc_cancel(struct svc_rqst *rqstp, struct nlm_args *argp,
         resp->cookie = argp->cookie;
 
         /* Don't accept requests during grace period */
-        if (nlmsvc_grace_period) {
+        if (locks_in_grace()) {
                 resp->status = nlm_lck_denied_grace_period;
                 return rpc_success;
         }
@@ -202,7 +202,7 @@ nlm4svc_proc_unlock(struct svc_rqst *rqstp, struct nlm_args *argp,
         resp->cookie = argp->cookie;
 
         /* Don't accept new lock requests during grace period */
-        if (nlmsvc_grace_period) {
+        if (locks_in_grace()) {
                 resp->status = nlm_lck_denied_grace_period;
                 return rpc_success;
         }
@@ -341,7 +341,7 @@ nlm4svc_proc_share(struct svc_rqst *rqstp, struct nlm_args *argp,
         resp->cookie = argp->cookie;
 
         /* Don't accept new lock requests during grace period */
-        if (nlmsvc_grace_period && !argp->reclaim) {
+        if (locks_in_grace() && !argp->reclaim) {
                 resp->status = nlm_lck_denied_grace_period;
                 return rpc_success;
         }
@@ -374,7 +374,7 @@ nlm4svc_proc_unshare(struct svc_rqst *rqstp, struct nlm_args *argp,
         resp->cookie = argp->cookie;
 
         /* Don't accept requests during grace period */
-        if (nlmsvc_grace_period) {
+        if (locks_in_grace()) {
                 resp->status = nlm_lck_denied_grace_period;
                 return rpc_success;
         }