diff options
author | Miklos Szeredi <mszeredi@suse.cz> | 2008-06-16 07:20:29 -0400 |
---|---|---|
committer | J. Bruce Fields <bfields@citi.umich.edu> | 2008-06-23 13:02:50 -0400 |
commit | 8837abcab3d16608bd2c7fac051a839d48f2f30c (patch) | |
tree | d29865adb4292ff437a9a68b2c09aca9d56f2468 /fs/nfsd/nfs3proc.c | |
parent | 599eb3046a1380f31c65715f3940184c531c90cb (diff) |
nfsd: rename MAY_ flags
Rename nfsd_permission() specific MAY_* flags to NFSD_MAY_* to make it
clear, that these are not used outside nfsd, and to avoid name and
number space conflicts with the VFS.
[comment from hch: rename MAY_READ, MAY_WRITE and MAY_EXEC as well]
Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Diffstat (limited to 'fs/nfsd/nfs3proc.c')
-rw-r--r-- | fs/nfsd/nfs3proc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/nfsd/nfs3proc.c b/fs/nfsd/nfs3proc.c index c721a1e6e9dd..4d617ea28cfc 100644 --- a/fs/nfsd/nfs3proc.c +++ b/fs/nfsd/nfs3proc.c | |||
@@ -63,7 +63,7 @@ nfsd3_proc_getattr(struct svc_rqst *rqstp, struct nfsd_fhandle *argp, | |||
63 | SVCFH_fmt(&argp->fh)); | 63 | SVCFH_fmt(&argp->fh)); |
64 | 64 | ||
65 | fh_copy(&resp->fh, &argp->fh); | 65 | fh_copy(&resp->fh, &argp->fh); |
66 | nfserr = fh_verify(rqstp, &resp->fh, 0, MAY_NOP); | 66 | nfserr = fh_verify(rqstp, &resp->fh, 0, NFSD_MAY_NOP); |
67 | if (nfserr) | 67 | if (nfserr) |
68 | RETURN_STATUS(nfserr); | 68 | RETURN_STATUS(nfserr); |
69 | 69 | ||
@@ -242,7 +242,7 @@ nfsd3_proc_create(struct svc_rqst *rqstp, struct nfsd3_createargs *argp, | |||
242 | attr = &argp->attrs; | 242 | attr = &argp->attrs; |
243 | 243 | ||
244 | /* Get the directory inode */ | 244 | /* Get the directory inode */ |
245 | nfserr = fh_verify(rqstp, dirfhp, S_IFDIR, MAY_CREATE); | 245 | nfserr = fh_verify(rqstp, dirfhp, S_IFDIR, NFSD_MAY_CREATE); |
246 | if (nfserr) | 246 | if (nfserr) |
247 | RETURN_STATUS(nfserr); | 247 | RETURN_STATUS(nfserr); |
248 | 248 | ||
@@ -558,7 +558,7 @@ nfsd3_proc_fsinfo(struct svc_rqst * rqstp, struct nfsd_fhandle *argp, | |||
558 | resp->f_maxfilesize = ~(u32) 0; | 558 | resp->f_maxfilesize = ~(u32) 0; |
559 | resp->f_properties = NFS3_FSF_DEFAULT; | 559 | resp->f_properties = NFS3_FSF_DEFAULT; |
560 | 560 | ||
561 | nfserr = fh_verify(rqstp, &argp->fh, 0, MAY_NOP); | 561 | nfserr = fh_verify(rqstp, &argp->fh, 0, NFSD_MAY_NOP); |
562 | 562 | ||
563 | /* Check special features of the file system. May request | 563 | /* Check special features of the file system. May request |
564 | * different read/write sizes for file systems known to have | 564 | * different read/write sizes for file systems known to have |
@@ -597,7 +597,7 @@ nfsd3_proc_pathconf(struct svc_rqst * rqstp, struct nfsd_fhandle *argp, | |||
597 | resp->p_case_insensitive = 0; | 597 | resp->p_case_insensitive = 0; |
598 | resp->p_case_preserving = 1; | 598 | resp->p_case_preserving = 1; |
599 | 599 | ||
600 | nfserr = fh_verify(rqstp, &argp->fh, 0, MAY_NOP); | 600 | nfserr = fh_verify(rqstp, &argp->fh, 0, NFSD_MAY_NOP); |
601 | 601 | ||
602 | if (nfserr == 0) { | 602 | if (nfserr == 0) { |
603 | struct super_block *sb = argp->fh.fh_dentry->d_inode->i_sb; | 603 | struct super_block *sb = argp->fh.fh_dentry->d_inode->i_sb; |