1 files changed, 13 insertions, 9 deletions

diff --git a/fs/lockd/svcproc.c b/fs/lockd/svcproc.c
index 9cd5c8b37593..88379cc6e0b1 100644
--- a/fs/lockd/svcproc.c
+++ b/fs/lockd/svcproc.c
@@ -113,6 +113,7 @@ nlmsvc_proc_test(struct svc_rqst *rqstp, struct nlm_args *argp,
 {
         struct nlm_host *host;
         struct nlm_file *file;
+        int rc = rpc_success;
 
         dprintk("lockd: TEST          called\n");
         resp->cookie = argp->cookie;
@@ -120,7 +121,7 @@ nlmsvc_proc_test(struct svc_rqst *rqstp, struct nlm_args *argp,
         /* Don't accept test requests during grace period */
         if (nlmsvc_grace_period) {
                 resp->status = nlm_lck_denied_grace_period;
-                return rpc_success;
+                return rc;
         }
 
         /* Obtain client and file */
@@ -130,13 +131,14 @@ nlmsvc_proc_test(struct svc_rqst *rqstp, struct nlm_args *argp,
         /* Now check for conflicting locks */
         resp->status = cast_status(nlmsvc_testlock(rqstp, file, &argp->lock, &resp->lock, &resp->cookie));
         if (resp->status == nlm_drop_reply)
-                return rpc_drop_reply;
+                rc = rpc_drop_reply;
+        else
+                dprintk("lockd: TEST          status %d vers %d\n",
+                        ntohl(resp->status), rqstp->rq_vers);
 
-        dprintk("lockd: TEST          status %d vers %d\n",
-                ntohl(resp->status), rqstp->rq_vers);
         nlm_release_host(host);
         nlm_release_file(file);
-        return rpc_success;
+        return rc;
 }
 
 static __be32
@@ -145,6 +147,7 @@ nlmsvc_proc_lock(struct svc_rqst *rqstp, struct nlm_args *argp,
 {
         struct nlm_host *host;
         struct nlm_file *file;
+        int rc = rpc_success;
 
         dprintk("lockd: LOCK          called\n");
 
@@ -153,7 +156,7 @@ nlmsvc_proc_lock(struct svc_rqst *rqstp, struct nlm_args *argp,
         /* Don't accept new lock requests during grace period */
         if (nlmsvc_grace_period && !argp->reclaim) {
                 resp->status = nlm_lck_denied_grace_period;
-                return rpc_success;
+                return rc;
         }
 
         /* Obtain client and file */
@@ -176,12 +179,13 @@ nlmsvc_proc_lock(struct svc_rqst *rqstp, struct nlm_args *argp,
         resp->status = cast_status(nlmsvc_lock(rqstp, file, &argp->lock,
                                                argp->block, &argp->cookie));
         if (resp->status == nlm_drop_reply)
-                return rpc_drop_reply;
+                rc = rpc_drop_reply;
+        else
+                dprintk("lockd: LOCK         status %d\n", ntohl(resp->status));
 
-        dprintk("lockd: LOCK          status %d\n", ntohl(resp->status));
         nlm_release_host(host);
         nlm_release_file(file);
-        return rpc_success;
+        return rc;
 }
 
 static __be32