1 files changed, 8 insertions, 6 deletions

diff --git a/fs/nfsd/lockd.c b/fs/nfsd/lockd.c
index 7b889ff15ae6..9b9e7e127c03 100644
--- a/fs/nfsd/lockd.c
+++ b/fs/nfsd/lockd.c
@@ -39,18 +39,20 @@ nlm_fopen(struct svc_rqst *rqstp, struct nfs_fh *f, struct file **filp)
         fh_put(&fh);
         rqstp->rq_client = NULL;
         exp_readunlock();
-        /* nlm and nfsd don't share error codes.
-         * we invent: 0 = no error
-         *            1 = stale file handle
-         *            2 = other error
+        /* We return nlm error codes as nlm doesn't know
+         * about nfsd, but nfsd does know about nlm..
          */
         switch (nfserr) {
         case nfs_ok:
                 return 0;
+        case nfserr_dropit:
+                return nlm_drop_reply;
+#ifdef CONFIG_LOCKD_V4
         case nfserr_stale:
-                return 1;
+                return nlm4_stale_fh;
+#endif
         default:
-                return 2;
+                return nlm_lck_denied;
         }
 }