diff options
Diffstat (limited to 'fs/nfsd/nfsproc.c')
-rw-r--r-- | fs/nfsd/nfsproc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/nfsd/nfsproc.c b/fs/nfsd/nfsproc.c index b5a20c486712..0766f95d236a 100644 --- a/fs/nfsd/nfsproc.c +++ b/fs/nfsd/nfsproc.c | |||
@@ -65,7 +65,7 @@ nfsd_proc_getattr(struct svc_rqst *rqstp, struct nfsd_fhandle *argp, | |||
65 | dprintk("nfsd: GETATTR %s\n", SVCFH_fmt(&argp->fh)); | 65 | dprintk("nfsd: GETATTR %s\n", SVCFH_fmt(&argp->fh)); |
66 | 66 | ||
67 | fh_copy(&resp->fh, &argp->fh); | 67 | fh_copy(&resp->fh, &argp->fh); |
68 | nfserr = fh_verify(rqstp, &resp->fh, 0, MAY_NOP); | 68 | nfserr = fh_verify(rqstp, &resp->fh, 0, NFSD_MAY_NOP); |
69 | return nfsd_return_attrs(nfserr, resp); | 69 | return nfsd_return_attrs(nfserr, resp); |
70 | } | 70 | } |
71 | 71 | ||
@@ -215,11 +215,11 @@ nfsd_proc_create(struct svc_rqst *rqstp, struct nfsd_createargs *argp, | |||
215 | SVCFH_fmt(dirfhp), argp->len, argp->name); | 215 | SVCFH_fmt(dirfhp), argp->len, argp->name); |
216 | 216 | ||
217 | /* First verify the parent file handle */ | 217 | /* First verify the parent file handle */ |
218 | nfserr = fh_verify(rqstp, dirfhp, S_IFDIR, MAY_EXEC); | 218 | nfserr = fh_verify(rqstp, dirfhp, S_IFDIR, NFSD_MAY_EXEC); |
219 | if (nfserr) | 219 | if (nfserr) |
220 | goto done; /* must fh_put dirfhp even on error */ | 220 | goto done; /* must fh_put dirfhp even on error */ |
221 | 221 | ||
222 | /* Check for MAY_WRITE in nfsd_create if necessary */ | 222 | /* Check for NFSD_MAY_WRITE in nfsd_create if necessary */ |
223 | 223 | ||
224 | nfserr = nfserr_acces; | 224 | nfserr = nfserr_acces; |
225 | if (!argp->len) | 225 | if (!argp->len) |
@@ -281,7 +281,7 @@ nfsd_proc_create(struct svc_rqst *rqstp, struct nfsd_createargs *argp, | |||
281 | nfserr = nfsd_permission(rqstp, | 281 | nfserr = nfsd_permission(rqstp, |
282 | newfhp->fh_export, | 282 | newfhp->fh_export, |
283 | newfhp->fh_dentry, | 283 | newfhp->fh_dentry, |
284 | MAY_WRITE|MAY_LOCAL_ACCESS); | 284 | NFSD_MAY_WRITE|NFSD_MAY_LOCAL_ACCESS); |
285 | if (nfserr && nfserr != nfserr_rofs) | 285 | if (nfserr && nfserr != nfserr_rofs) |
286 | goto out_unlock; | 286 | goto out_unlock; |
287 | } | 287 | } |