diff options
author | Al Viro <viro@ftp.linux.org.uk> | 2006-10-20 02:28:56 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-20 13:26:41 -0400 |
commit | 131a21c2177c267ab259fcd06947c6f593a7de8e (patch) | |
tree | 7841d3c58e3dfc103fefb895e43bac0f5afbd751 /fs/nfsd/nfs2acl.c | |
parent | ad451d389f46f699832da3e9ad95f610cb8c0fd2 (diff) |
[PATCH] xdr annotations: NFSv2 server
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Acked-by: Trond Myklebust <trond.myklebust@fys.uio.no>
Acked-by: Neil Brown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs/nfsd/nfs2acl.c')
-rw-r--r-- | fs/nfsd/nfs2acl.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/fs/nfsd/nfs2acl.c b/fs/nfsd/nfs2acl.c index 8d48616882c1..fd5397d8c62a 100644 --- a/fs/nfsd/nfs2acl.c +++ b/fs/nfsd/nfs2acl.c | |||
@@ -158,7 +158,7 @@ static __be32 nfsacld_proc_access(struct svc_rqst *rqstp, struct nfsd3_accessarg | |||
158 | /* | 158 | /* |
159 | * XDR decode functions | 159 | * XDR decode functions |
160 | */ | 160 | */ |
161 | static int nfsaclsvc_decode_getaclargs(struct svc_rqst *rqstp, u32 *p, | 161 | static int nfsaclsvc_decode_getaclargs(struct svc_rqst *rqstp, __be32 *p, |
162 | struct nfsd3_getaclargs *argp) | 162 | struct nfsd3_getaclargs *argp) |
163 | { | 163 | { |
164 | if (!(p = nfs2svc_decode_fh(p, &argp->fh))) | 164 | if (!(p = nfs2svc_decode_fh(p, &argp->fh))) |
@@ -169,7 +169,7 @@ static int nfsaclsvc_decode_getaclargs(struct svc_rqst *rqstp, u32 *p, | |||
169 | } | 169 | } |
170 | 170 | ||
171 | 171 | ||
172 | static int nfsaclsvc_decode_setaclargs(struct svc_rqst *rqstp, u32 *p, | 172 | static int nfsaclsvc_decode_setaclargs(struct svc_rqst *rqstp, __be32 *p, |
173 | struct nfsd3_setaclargs *argp) | 173 | struct nfsd3_setaclargs *argp) |
174 | { | 174 | { |
175 | struct kvec *head = rqstp->rq_arg.head; | 175 | struct kvec *head = rqstp->rq_arg.head; |
@@ -194,7 +194,7 @@ static int nfsaclsvc_decode_setaclargs(struct svc_rqst *rqstp, u32 *p, | |||
194 | return (n > 0); | 194 | return (n > 0); |
195 | } | 195 | } |
196 | 196 | ||
197 | static int nfsaclsvc_decode_fhandleargs(struct svc_rqst *rqstp, u32 *p, | 197 | static int nfsaclsvc_decode_fhandleargs(struct svc_rqst *rqstp, __be32 *p, |
198 | struct nfsd_fhandle *argp) | 198 | struct nfsd_fhandle *argp) |
199 | { | 199 | { |
200 | if (!(p = nfs2svc_decode_fh(p, &argp->fh))) | 200 | if (!(p = nfs2svc_decode_fh(p, &argp->fh))) |
@@ -202,7 +202,7 @@ static int nfsaclsvc_decode_fhandleargs(struct svc_rqst *rqstp, u32 *p, | |||
202 | return xdr_argsize_check(rqstp, p); | 202 | return xdr_argsize_check(rqstp, p); |
203 | } | 203 | } |
204 | 204 | ||
205 | static int nfsaclsvc_decode_accessargs(struct svc_rqst *rqstp, u32 *p, | 205 | static int nfsaclsvc_decode_accessargs(struct svc_rqst *rqstp, __be32 *p, |
206 | struct nfsd3_accessargs *argp) | 206 | struct nfsd3_accessargs *argp) |
207 | { | 207 | { |
208 | if (!(p = nfs2svc_decode_fh(p, &argp->fh))) | 208 | if (!(p = nfs2svc_decode_fh(p, &argp->fh))) |
@@ -217,7 +217,7 @@ static int nfsaclsvc_decode_accessargs(struct svc_rqst *rqstp, u32 *p, | |||
217 | */ | 217 | */ |
218 | 218 | ||
219 | /* GETACL */ | 219 | /* GETACL */ |
220 | static int nfsaclsvc_encode_getaclres(struct svc_rqst *rqstp, u32 *p, | 220 | static int nfsaclsvc_encode_getaclres(struct svc_rqst *rqstp, __be32 *p, |
221 | struct nfsd3_getaclres *resp) | 221 | struct nfsd3_getaclres *resp) |
222 | { | 222 | { |
223 | struct dentry *dentry = resp->fh.fh_dentry; | 223 | struct dentry *dentry = resp->fh.fh_dentry; |
@@ -259,7 +259,7 @@ static int nfsaclsvc_encode_getaclres(struct svc_rqst *rqstp, u32 *p, | |||
259 | return 1; | 259 | return 1; |
260 | } | 260 | } |
261 | 261 | ||
262 | static int nfsaclsvc_encode_attrstatres(struct svc_rqst *rqstp, u32 *p, | 262 | static int nfsaclsvc_encode_attrstatres(struct svc_rqst *rqstp, __be32 *p, |
263 | struct nfsd_attrstat *resp) | 263 | struct nfsd_attrstat *resp) |
264 | { | 264 | { |
265 | p = nfs2svc_encode_fattr(rqstp, p, &resp->fh); | 265 | p = nfs2svc_encode_fattr(rqstp, p, &resp->fh); |
@@ -267,7 +267,7 @@ static int nfsaclsvc_encode_attrstatres(struct svc_rqst *rqstp, u32 *p, | |||
267 | } | 267 | } |
268 | 268 | ||
269 | /* ACCESS */ | 269 | /* ACCESS */ |
270 | static int nfsaclsvc_encode_accessres(struct svc_rqst *rqstp, u32 *p, | 270 | static int nfsaclsvc_encode_accessres(struct svc_rqst *rqstp, __be32 *p, |
271 | struct nfsd3_accessres *resp) | 271 | struct nfsd3_accessres *resp) |
272 | { | 272 | { |
273 | p = nfs2svc_encode_fattr(rqstp, p, &resp->fh); | 273 | p = nfs2svc_encode_fattr(rqstp, p, &resp->fh); |
@@ -278,7 +278,7 @@ static int nfsaclsvc_encode_accessres(struct svc_rqst *rqstp, u32 *p, | |||
278 | /* | 278 | /* |
279 | * XDR release functions | 279 | * XDR release functions |
280 | */ | 280 | */ |
281 | static int nfsaclsvc_release_getacl(struct svc_rqst *rqstp, u32 *p, | 281 | static int nfsaclsvc_release_getacl(struct svc_rqst *rqstp, __be32 *p, |
282 | struct nfsd3_getaclres *resp) | 282 | struct nfsd3_getaclres *resp) |
283 | { | 283 | { |
284 | fh_put(&resp->fh); | 284 | fh_put(&resp->fh); |
@@ -287,7 +287,7 @@ static int nfsaclsvc_release_getacl(struct svc_rqst *rqstp, u32 *p, | |||
287 | return 1; | 287 | return 1; |
288 | } | 288 | } |
289 | 289 | ||
290 | static int nfsaclsvc_release_fhandle(struct svc_rqst *rqstp, u32 *p, | 290 | static int nfsaclsvc_release_fhandle(struct svc_rqst *rqstp, __be32 *p, |
291 | struct nfsd_fhandle *resp) | 291 | struct nfsd_fhandle *resp) |
292 | { | 292 | { |
293 | fh_put(&resp->fh); | 293 | fh_put(&resp->fh); |