This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / fs / lockd / svcsubs.c

diff --git a/fs/lockd/svcsubs.c b/fs/lockd/svcsubs.c
index de75363..91f0300 100644 (file)
--- a/fs/lockd/svcsubs.c
+++ b/fs/lockd/svcsubs.c
@@ -90,7 +90,7 @@ nlm_lookup_file(struct svc_rqst *rqstp, struct nlm_file **result,
         * the file.
         */
        if ((nfserr = nlmsvc_ops->fopen(rqstp, f, &file->f_file)) != 0) {
-               dprintk("lockd: open failed (nfserr %d)\n", ntohl(nfserr));
+               dprintk("lockd: open failed (nfserr %d)\n", nfserr);
                goto out_free;
        }
 
@@ -114,7 +114,10 @@ out_free:
                nfserr = nlm4_stale_fh;
        else
 #endif
-       nfserr = nlm_lck_denied;
+       if (nfserr == 2)
+               nfserr = nlm_lck_dropit;
+       else
+               nfserr = nlm_lck_denied;
        goto out_unlock;
 }