lockd: move grace period checks to common code

Do all the grace period checks in svclock.c.  This simplifies the code a
bit, and will ease some later changes.

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

1 files changed, 2 insertions, 13 deletions

diff --git a/fs/lockd/svcproc.c b/fs/lockd/svcproc.c
index 1b013e198804..a587b81338b1 100644
--- a/fs/lockd/svcproc.c
+++ b/fs/lockd/svcproc.c
@@ -117,12 +117,6 @@ nlmsvc_proc_test(struct svc_rqst *rqstp, struct nlm_args *argp,
         dprintk("lockd: TEST          called\n");
         resp->cookie = argp->cookie;
 
-        /* Don't accept test requests during grace period */
-        if (locks_in_grace()) {
-                resp->status = nlm_lck_denied_grace_period;
-                return rc;
-        }
-
         /* Obtain client and file */
         if ((resp->status = nlmsvc_retrieve_args(rqstp, argp, &host, &file)))
                 return resp->status == nlm_drop_reply ? rpc_drop_reply :rpc_success;
@@ -152,12 +146,6 @@ nlmsvc_proc_lock(struct svc_rqst *rqstp, struct nlm_args *argp,
 
         resp->cookie = argp->cookie;
 
-        /* Don't accept new lock requests during grace period */
-        if (locks_in_grace() && !argp->reclaim) {
-                resp->status = nlm_lck_denied_grace_period;
-                return rc;
-        }
-
         /* Obtain client and file */
         if ((resp->status = nlmsvc_retrieve_args(rqstp, argp, &host, &file)))
                 return resp->status == nlm_drop_reply ? rpc_drop_reply :rpc_success;
@@ -176,7 +164,8 @@ nlmsvc_proc_lock(struct svc_rqst *rqstp, struct nlm_args *argp,
 
         /* Now try to lock the file */
         resp->status = cast_status(nlmsvc_lock(rqstp, file, host, &argp->lock,
-                                               argp->block, &argp->cookie));
+                                               argp->block, &argp->cookie,
+                                               argp->reclaim));
         if (resp->status == nlm_drop_reply)
                 rc = rpc_drop_reply;
         else