nfsd: fix spurious EACCESS in reconnect_path()

[safe/jmp/linux-2.6] / fs / nfsd / nfs4state.c

diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index bf11d68..eca8aaa 100644 (file)
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -1722,9 +1722,9 @@ nfsd4_process_open2(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nf
                /* Stateid was not found, this is a new OPEN */
                int flags = 0;
                if (open->op_share_access & NFS4_SHARE_ACCESS_READ)
-                       flags |= MAY_READ;
+                       flags |= NFSD_MAY_READ;
                if (open->op_share_access & NFS4_SHARE_ACCESS_WRITE)
-                       flags |= MAY_WRITE;
+                       flags |= NFSD_MAY_WRITE;
                status = nfs4_new_open(rqstp, &stp, dp, current_fh, flags);
                if (status)
                        goto out;
@@ -2610,7 +2610,7 @@ nfsd4_lock(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
                 return nfserr_inval;
 
        if ((status = fh_verify(rqstp, &cstate->current_fh,
-                               S_IFREG, MAY_LOCK))) {
+                               S_IFREG, NFSD_MAY_LOCK))) {
                dprintk("NFSD: nfsd4_lock: permission denied!\n");
                return status;
        }