diff options
author | Al Viro <viro@ftp.linux.org.uk> | 2006-10-20 02:28:57 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-20 13:26:41 -0400 |
commit | 91f07168cef8e99dd16f608fbc703e7a5af0237f (patch) | |
tree | 18ba76b4d8728637059741de9eb9caad40dbb483 /fs | |
parent | 131a21c2177c267ab259fcd06947c6f593a7de8e (diff) |
[PATCH] xdr annotations: NFSv3 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')
-rw-r--r-- | fs/nfsd/nfs3acl.c | 10 | ||||
-rw-r--r-- | fs/nfsd/nfs3xdr.c | 126 |
2 files changed, 68 insertions, 68 deletions
diff --git a/fs/nfsd/nfs3acl.c b/fs/nfsd/nfs3acl.c index ed6e2c27b5e8..78b2c83d00c5 100644 --- a/fs/nfsd/nfs3acl.c +++ b/fs/nfsd/nfs3acl.c | |||
@@ -122,7 +122,7 @@ static __be32 nfsd3_proc_setacl(struct svc_rqst * rqstp, | |||
122 | /* | 122 | /* |
123 | * XDR decode functions | 123 | * XDR decode functions |
124 | */ | 124 | */ |
125 | static int nfs3svc_decode_getaclargs(struct svc_rqst *rqstp, u32 *p, | 125 | static int nfs3svc_decode_getaclargs(struct svc_rqst *rqstp, __be32 *p, |
126 | struct nfsd3_getaclargs *args) | 126 | struct nfsd3_getaclargs *args) |
127 | { | 127 | { |
128 | if (!(p = nfs3svc_decode_fh(p, &args->fh))) | 128 | if (!(p = nfs3svc_decode_fh(p, &args->fh))) |
@@ -133,7 +133,7 @@ static int nfs3svc_decode_getaclargs(struct svc_rqst *rqstp, u32 *p, | |||
133 | } | 133 | } |
134 | 134 | ||
135 | 135 | ||
136 | static int nfs3svc_decode_setaclargs(struct svc_rqst *rqstp, u32 *p, | 136 | static int nfs3svc_decode_setaclargs(struct svc_rqst *rqstp, __be32 *p, |
137 | struct nfsd3_setaclargs *args) | 137 | struct nfsd3_setaclargs *args) |
138 | { | 138 | { |
139 | struct kvec *head = rqstp->rq_arg.head; | 139 | struct kvec *head = rqstp->rq_arg.head; |
@@ -163,7 +163,7 @@ static int nfs3svc_decode_setaclargs(struct svc_rqst *rqstp, u32 *p, | |||
163 | */ | 163 | */ |
164 | 164 | ||
165 | /* GETACL */ | 165 | /* GETACL */ |
166 | static int nfs3svc_encode_getaclres(struct svc_rqst *rqstp, u32 *p, | 166 | static int nfs3svc_encode_getaclres(struct svc_rqst *rqstp, __be32 *p, |
167 | struct nfsd3_getaclres *resp) | 167 | struct nfsd3_getaclres *resp) |
168 | { | 168 | { |
169 | struct dentry *dentry = resp->fh.fh_dentry; | 169 | struct dentry *dentry = resp->fh.fh_dentry; |
@@ -208,7 +208,7 @@ static int nfs3svc_encode_getaclres(struct svc_rqst *rqstp, u32 *p, | |||
208 | } | 208 | } |
209 | 209 | ||
210 | /* SETACL */ | 210 | /* SETACL */ |
211 | static int nfs3svc_encode_setaclres(struct svc_rqst *rqstp, u32 *p, | 211 | static int nfs3svc_encode_setaclres(struct svc_rqst *rqstp, __be32 *p, |
212 | struct nfsd3_attrstat *resp) | 212 | struct nfsd3_attrstat *resp) |
213 | { | 213 | { |
214 | p = nfs3svc_encode_post_op_attr(rqstp, p, &resp->fh); | 214 | p = nfs3svc_encode_post_op_attr(rqstp, p, &resp->fh); |
@@ -219,7 +219,7 @@ static int nfs3svc_encode_setaclres(struct svc_rqst *rqstp, u32 *p, | |||
219 | /* | 219 | /* |
220 | * XDR release functions | 220 | * XDR release functions |
221 | */ | 221 | */ |
222 | static int nfs3svc_release_getacl(struct svc_rqst *rqstp, u32 *p, | 222 | static int nfs3svc_release_getacl(struct svc_rqst *rqstp, __be32 *p, |
223 | struct nfsd3_getaclres *resp) | 223 | struct nfsd3_getaclres *resp) |
224 | { | 224 | { |
225 | fh_put(&resp->fh); | 225 | fh_put(&resp->fh); |
diff --git a/fs/nfsd/nfs3xdr.c b/fs/nfsd/nfs3xdr.c index 247d518248bf..b4baca3053c3 100644 --- a/fs/nfsd/nfs3xdr.c +++ b/fs/nfsd/nfs3xdr.c | |||
@@ -42,23 +42,23 @@ static u32 nfs3_ftypes[] = { | |||
42 | /* | 42 | /* |
43 | * XDR functions for basic NFS types | 43 | * XDR functions for basic NFS types |
44 | */ | 44 | */ |
45 | static inline u32 * | 45 | static inline __be32 * |
46 | encode_time3(u32 *p, struct timespec *time) | 46 | encode_time3(__be32 *p, struct timespec *time) |
47 | { | 47 | { |
48 | *p++ = htonl((u32) time->tv_sec); *p++ = htonl(time->tv_nsec); | 48 | *p++ = htonl((u32) time->tv_sec); *p++ = htonl(time->tv_nsec); |
49 | return p; | 49 | return p; |
50 | } | 50 | } |
51 | 51 | ||
52 | static inline u32 * | 52 | static inline __be32 * |
53 | decode_time3(u32 *p, struct timespec *time) | 53 | decode_time3(__be32 *p, struct timespec *time) |
54 | { | 54 | { |
55 | time->tv_sec = ntohl(*p++); | 55 | time->tv_sec = ntohl(*p++); |
56 | time->tv_nsec = ntohl(*p++); | 56 | time->tv_nsec = ntohl(*p++); |
57 | return p; | 57 | return p; |
58 | } | 58 | } |
59 | 59 | ||
60 | static inline u32 * | 60 | static inline __be32 * |
61 | decode_fh(u32 *p, struct svc_fh *fhp) | 61 | decode_fh(__be32 *p, struct svc_fh *fhp) |
62 | { | 62 | { |
63 | unsigned int size; | 63 | unsigned int size; |
64 | fh_init(fhp, NFS3_FHSIZE); | 64 | fh_init(fhp, NFS3_FHSIZE); |
@@ -72,13 +72,13 @@ decode_fh(u32 *p, struct svc_fh *fhp) | |||
72 | } | 72 | } |
73 | 73 | ||
74 | /* Helper function for NFSv3 ACL code */ | 74 | /* Helper function for NFSv3 ACL code */ |
75 | u32 *nfs3svc_decode_fh(u32 *p, struct svc_fh *fhp) | 75 | __be32 *nfs3svc_decode_fh(__be32 *p, struct svc_fh *fhp) |
76 | { | 76 | { |
77 | return decode_fh(p, fhp); | 77 | return decode_fh(p, fhp); |
78 | } | 78 | } |
79 | 79 | ||
80 | static inline u32 * | 80 | static inline __be32 * |
81 | encode_fh(u32 *p, struct svc_fh *fhp) | 81 | encode_fh(__be32 *p, struct svc_fh *fhp) |
82 | { | 82 | { |
83 | unsigned int size = fhp->fh_handle.fh_size; | 83 | unsigned int size = fhp->fh_handle.fh_size; |
84 | *p++ = htonl(size); | 84 | *p++ = htonl(size); |
@@ -91,8 +91,8 @@ encode_fh(u32 *p, struct svc_fh *fhp) | |||
91 | * Decode a file name and make sure that the path contains | 91 | * Decode a file name and make sure that the path contains |
92 | * no slashes or null bytes. | 92 | * no slashes or null bytes. |
93 | */ | 93 | */ |
94 | static inline u32 * | 94 | static inline __be32 * |
95 | decode_filename(u32 *p, char **namp, int *lenp) | 95 | decode_filename(__be32 *p, char **namp, int *lenp) |
96 | { | 96 | { |
97 | char *name; | 97 | char *name; |
98 | int i; | 98 | int i; |
@@ -107,8 +107,8 @@ decode_filename(u32 *p, char **namp, int *lenp) | |||
107 | return p; | 107 | return p; |
108 | } | 108 | } |
109 | 109 | ||
110 | static inline u32 * | 110 | static inline __be32 * |
111 | decode_sattr3(u32 *p, struct iattr *iap) | 111 | decode_sattr3(__be32 *p, struct iattr *iap) |
112 | { | 112 | { |
113 | u32 tmp; | 113 | u32 tmp; |
114 | 114 | ||
@@ -153,8 +153,8 @@ decode_sattr3(u32 *p, struct iattr *iap) | |||
153 | return p; | 153 | return p; |
154 | } | 154 | } |
155 | 155 | ||
156 | static inline u32 * | 156 | static inline __be32 * |
157 | encode_fattr3(struct svc_rqst *rqstp, u32 *p, struct svc_fh *fhp, | 157 | encode_fattr3(struct svc_rqst *rqstp, __be32 *p, struct svc_fh *fhp, |
158 | struct kstat *stat) | 158 | struct kstat *stat) |
159 | { | 159 | { |
160 | struct dentry *dentry = fhp->fh_dentry; | 160 | struct dentry *dentry = fhp->fh_dentry; |
@@ -186,8 +186,8 @@ encode_fattr3(struct svc_rqst *rqstp, u32 *p, struct svc_fh *fhp, | |||
186 | return p; | 186 | return p; |
187 | } | 187 | } |
188 | 188 | ||
189 | static inline u32 * | 189 | static inline __be32 * |
190 | encode_saved_post_attr(struct svc_rqst *rqstp, u32 *p, struct svc_fh *fhp) | 190 | encode_saved_post_attr(struct svc_rqst *rqstp, __be32 *p, struct svc_fh *fhp) |
191 | { | 191 | { |
192 | struct inode *inode = fhp->fh_dentry->d_inode; | 192 | struct inode *inode = fhp->fh_dentry->d_inode; |
193 | 193 | ||
@@ -224,8 +224,8 @@ encode_saved_post_attr(struct svc_rqst *rqstp, u32 *p, struct svc_fh *fhp) | |||
224 | * The inode may be NULL if the call failed because of a stale file | 224 | * The inode may be NULL if the call failed because of a stale file |
225 | * handle. In this case, no attributes are returned. | 225 | * handle. In this case, no attributes are returned. |
226 | */ | 226 | */ |
227 | static u32 * | 227 | static __be32 * |
228 | encode_post_op_attr(struct svc_rqst *rqstp, u32 *p, struct svc_fh *fhp) | 228 | encode_post_op_attr(struct svc_rqst *rqstp, __be32 *p, struct svc_fh *fhp) |
229 | { | 229 | { |
230 | struct dentry *dentry = fhp->fh_dentry; | 230 | struct dentry *dentry = fhp->fh_dentry; |
231 | if (dentry && dentry->d_inode != NULL) { | 231 | if (dentry && dentry->d_inode != NULL) { |
@@ -243,8 +243,8 @@ encode_post_op_attr(struct svc_rqst *rqstp, u32 *p, struct svc_fh *fhp) | |||
243 | } | 243 | } |
244 | 244 | ||
245 | /* Helper for NFSv3 ACLs */ | 245 | /* Helper for NFSv3 ACLs */ |
246 | u32 * | 246 | __be32 * |
247 | nfs3svc_encode_post_op_attr(struct svc_rqst *rqstp, u32 *p, struct svc_fh *fhp) | 247 | nfs3svc_encode_post_op_attr(struct svc_rqst *rqstp, __be32 *p, struct svc_fh *fhp) |
248 | { | 248 | { |
249 | return encode_post_op_attr(rqstp, p, fhp); | 249 | return encode_post_op_attr(rqstp, p, fhp); |
250 | } | 250 | } |
@@ -252,8 +252,8 @@ nfs3svc_encode_post_op_attr(struct svc_rqst *rqstp, u32 *p, struct svc_fh *fhp) | |||
252 | /* | 252 | /* |
253 | * Enocde weak cache consistency data | 253 | * Enocde weak cache consistency data |
254 | */ | 254 | */ |
255 | static u32 * | 255 | static __be32 * |
256 | encode_wcc_data(struct svc_rqst *rqstp, u32 *p, struct svc_fh *fhp) | 256 | encode_wcc_data(struct svc_rqst *rqstp, __be32 *p, struct svc_fh *fhp) |
257 | { | 257 | { |
258 | struct dentry *dentry = fhp->fh_dentry; | 258 | struct dentry *dentry = fhp->fh_dentry; |
259 | 259 | ||
@@ -278,7 +278,7 @@ encode_wcc_data(struct svc_rqst *rqstp, u32 *p, struct svc_fh *fhp) | |||
278 | * XDR decode functions | 278 | * XDR decode functions |
279 | */ | 279 | */ |
280 | int | 280 | int |
281 | nfs3svc_decode_fhandle(struct svc_rqst *rqstp, u32 *p, struct nfsd_fhandle *args) | 281 | nfs3svc_decode_fhandle(struct svc_rqst *rqstp, __be32 *p, struct nfsd_fhandle *args) |
282 | { | 282 | { |
283 | if (!(p = decode_fh(p, &args->fh))) | 283 | if (!(p = decode_fh(p, &args->fh))) |
284 | return 0; | 284 | return 0; |
@@ -286,7 +286,7 @@ nfs3svc_decode_fhandle(struct svc_rqst *rqstp, u32 *p, struct nfsd_fhandle *args | |||
286 | } | 286 | } |
287 | 287 | ||
288 | int | 288 | int |
289 | nfs3svc_decode_sattrargs(struct svc_rqst *rqstp, u32 *p, | 289 | nfs3svc_decode_sattrargs(struct svc_rqst *rqstp, __be32 *p, |
290 | struct nfsd3_sattrargs *args) | 290 | struct nfsd3_sattrargs *args) |
291 | { | 291 | { |
292 | if (!(p = decode_fh(p, &args->fh)) | 292 | if (!(p = decode_fh(p, &args->fh)) |
@@ -303,7 +303,7 @@ nfs3svc_decode_sattrargs(struct svc_rqst *rqstp, u32 *p, | |||
303 | } | 303 | } |
304 | 304 | ||
305 | int | 305 | int |
306 | nfs3svc_decode_diropargs(struct svc_rqst *rqstp, u32 *p, | 306 | nfs3svc_decode_diropargs(struct svc_rqst *rqstp, __be32 *p, |
307 | struct nfsd3_diropargs *args) | 307 | struct nfsd3_diropargs *args) |
308 | { | 308 | { |
309 | if (!(p = decode_fh(p, &args->fh)) | 309 | if (!(p = decode_fh(p, &args->fh)) |
@@ -314,7 +314,7 @@ nfs3svc_decode_diropargs(struct svc_rqst *rqstp, u32 *p, | |||
314 | } | 314 | } |
315 | 315 | ||
316 | int | 316 | int |
317 | nfs3svc_decode_accessargs(struct svc_rqst *rqstp, u32 *p, | 317 | nfs3svc_decode_accessargs(struct svc_rqst *rqstp, __be32 *p, |
318 | struct nfsd3_accessargs *args) | 318 | struct nfsd3_accessargs *args) |
319 | { | 319 | { |
320 | if (!(p = decode_fh(p, &args->fh))) | 320 | if (!(p = decode_fh(p, &args->fh))) |
@@ -325,7 +325,7 @@ nfs3svc_decode_accessargs(struct svc_rqst *rqstp, u32 *p, | |||
325 | } | 325 | } |
326 | 326 | ||
327 | int | 327 | int |
328 | nfs3svc_decode_readargs(struct svc_rqst *rqstp, u32 *p, | 328 | nfs3svc_decode_readargs(struct svc_rqst *rqstp, __be32 *p, |
329 | struct nfsd3_readargs *args) | 329 | struct nfsd3_readargs *args) |
330 | { | 330 | { |
331 | unsigned int len; | 331 | unsigned int len; |
@@ -355,7 +355,7 @@ nfs3svc_decode_readargs(struct svc_rqst *rqstp, u32 *p, | |||
355 | } | 355 | } |
356 | 356 | ||
357 | int | 357 | int |
358 | nfs3svc_decode_writeargs(struct svc_rqst *rqstp, u32 *p, | 358 | nfs3svc_decode_writeargs(struct svc_rqst *rqstp, __be32 *p, |
359 | struct nfsd3_writeargs *args) | 359 | struct nfsd3_writeargs *args) |
360 | { | 360 | { |
361 | unsigned int len, v, hdr; | 361 | unsigned int len, v, hdr; |
@@ -393,7 +393,7 @@ nfs3svc_decode_writeargs(struct svc_rqst *rqstp, u32 *p, | |||
393 | } | 393 | } |
394 | 394 | ||
395 | int | 395 | int |
396 | nfs3svc_decode_createargs(struct svc_rqst *rqstp, u32 *p, | 396 | nfs3svc_decode_createargs(struct svc_rqst *rqstp, __be32 *p, |
397 | struct nfsd3_createargs *args) | 397 | struct nfsd3_createargs *args) |
398 | { | 398 | { |
399 | if (!(p = decode_fh(p, &args->fh)) | 399 | if (!(p = decode_fh(p, &args->fh)) |
@@ -417,7 +417,7 @@ nfs3svc_decode_createargs(struct svc_rqst *rqstp, u32 *p, | |||
417 | return xdr_argsize_check(rqstp, p); | 417 | return xdr_argsize_check(rqstp, p); |
418 | } | 418 | } |
419 | int | 419 | int |
420 | nfs3svc_decode_mkdirargs(struct svc_rqst *rqstp, u32 *p, | 420 | nfs3svc_decode_mkdirargs(struct svc_rqst *rqstp, __be32 *p, |
421 | struct nfsd3_createargs *args) | 421 | struct nfsd3_createargs *args) |
422 | { | 422 | { |
423 | if (!(p = decode_fh(p, &args->fh)) | 423 | if (!(p = decode_fh(p, &args->fh)) |
@@ -429,7 +429,7 @@ nfs3svc_decode_mkdirargs(struct svc_rqst *rqstp, u32 *p, | |||
429 | } | 429 | } |
430 | 430 | ||
431 | int | 431 | int |
432 | nfs3svc_decode_symlinkargs(struct svc_rqst *rqstp, u32 *p, | 432 | nfs3svc_decode_symlinkargs(struct svc_rqst *rqstp, __be32 *p, |
433 | struct nfsd3_symlinkargs *args) | 433 | struct nfsd3_symlinkargs *args) |
434 | { | 434 | { |
435 | unsigned int len; | 435 | unsigned int len; |
@@ -481,7 +481,7 @@ nfs3svc_decode_symlinkargs(struct svc_rqst *rqstp, u32 *p, | |||
481 | } | 481 | } |
482 | 482 | ||
483 | int | 483 | int |
484 | nfs3svc_decode_mknodargs(struct svc_rqst *rqstp, u32 *p, | 484 | nfs3svc_decode_mknodargs(struct svc_rqst *rqstp, __be32 *p, |
485 | struct nfsd3_mknodargs *args) | 485 | struct nfsd3_mknodargs *args) |
486 | { | 486 | { |
487 | if (!(p = decode_fh(p, &args->fh)) | 487 | if (!(p = decode_fh(p, &args->fh)) |
@@ -505,7 +505,7 @@ nfs3svc_decode_mknodargs(struct svc_rqst *rqstp, u32 *p, | |||
505 | } | 505 | } |
506 | 506 | ||
507 | int | 507 | int |
508 | nfs3svc_decode_renameargs(struct svc_rqst *rqstp, u32 *p, | 508 | nfs3svc_decode_renameargs(struct svc_rqst *rqstp, __be32 *p, |
509 | struct nfsd3_renameargs *args) | 509 | struct nfsd3_renameargs *args) |
510 | { | 510 | { |
511 | if (!(p = decode_fh(p, &args->ffh)) | 511 | if (!(p = decode_fh(p, &args->ffh)) |
@@ -518,7 +518,7 @@ nfs3svc_decode_renameargs(struct svc_rqst *rqstp, u32 *p, | |||
518 | } | 518 | } |
519 | 519 | ||
520 | int | 520 | int |
521 | nfs3svc_decode_readlinkargs(struct svc_rqst *rqstp, u32 *p, | 521 | nfs3svc_decode_readlinkargs(struct svc_rqst *rqstp, __be32 *p, |
522 | struct nfsd3_readlinkargs *args) | 522 | struct nfsd3_readlinkargs *args) |
523 | { | 523 | { |
524 | if (!(p = decode_fh(p, &args->fh))) | 524 | if (!(p = decode_fh(p, &args->fh))) |
@@ -530,7 +530,7 @@ nfs3svc_decode_readlinkargs(struct svc_rqst *rqstp, u32 *p, | |||
530 | } | 530 | } |
531 | 531 | ||
532 | int | 532 | int |
533 | nfs3svc_decode_linkargs(struct svc_rqst *rqstp, u32 *p, | 533 | nfs3svc_decode_linkargs(struct svc_rqst *rqstp, __be32 *p, |
534 | struct nfsd3_linkargs *args) | 534 | struct nfsd3_linkargs *args) |
535 | { | 535 | { |
536 | if (!(p = decode_fh(p, &args->ffh)) | 536 | if (!(p = decode_fh(p, &args->ffh)) |
@@ -542,7 +542,7 @@ nfs3svc_decode_linkargs(struct svc_rqst *rqstp, u32 *p, | |||
542 | } | 542 | } |
543 | 543 | ||
544 | int | 544 | int |
545 | nfs3svc_decode_readdirargs(struct svc_rqst *rqstp, u32 *p, | 545 | nfs3svc_decode_readdirargs(struct svc_rqst *rqstp, __be32 *p, |
546 | struct nfsd3_readdirargs *args) | 546 | struct nfsd3_readdirargs *args) |
547 | { | 547 | { |
548 | if (!(p = decode_fh(p, &args->fh))) | 548 | if (!(p = decode_fh(p, &args->fh))) |
@@ -562,7 +562,7 @@ nfs3svc_decode_readdirargs(struct svc_rqst *rqstp, u32 *p, | |||
562 | } | 562 | } |
563 | 563 | ||
564 | int | 564 | int |
565 | nfs3svc_decode_readdirplusargs(struct svc_rqst *rqstp, u32 *p, | 565 | nfs3svc_decode_readdirplusargs(struct svc_rqst *rqstp, __be32 *p, |
566 | struct nfsd3_readdirargs *args) | 566 | struct nfsd3_readdirargs *args) |
567 | { | 567 | { |
568 | int len, pn; | 568 | int len, pn; |
@@ -590,7 +590,7 @@ nfs3svc_decode_readdirplusargs(struct svc_rqst *rqstp, u32 *p, | |||
590 | } | 590 | } |
591 | 591 | ||
592 | int | 592 | int |
593 | nfs3svc_decode_commitargs(struct svc_rqst *rqstp, u32 *p, | 593 | nfs3svc_decode_commitargs(struct svc_rqst *rqstp, __be32 *p, |
594 | struct nfsd3_commitargs *args) | 594 | struct nfsd3_commitargs *args) |
595 | { | 595 | { |
596 | if (!(p = decode_fh(p, &args->fh))) | 596 | if (!(p = decode_fh(p, &args->fh))) |
@@ -609,14 +609,14 @@ nfs3svc_decode_commitargs(struct svc_rqst *rqstp, u32 *p, | |||
609 | * will work properly. | 609 | * will work properly. |
610 | */ | 610 | */ |
611 | int | 611 | int |
612 | nfs3svc_encode_voidres(struct svc_rqst *rqstp, u32 *p, void *dummy) | 612 | nfs3svc_encode_voidres(struct svc_rqst *rqstp, __be32 *p, void *dummy) |
613 | { | 613 | { |
614 | return xdr_ressize_check(rqstp, p); | 614 | return xdr_ressize_check(rqstp, p); |
615 | } | 615 | } |
616 | 616 | ||
617 | /* GETATTR */ | 617 | /* GETATTR */ |
618 | int | 618 | int |
619 | nfs3svc_encode_attrstat(struct svc_rqst *rqstp, u32 *p, | 619 | nfs3svc_encode_attrstat(struct svc_rqst *rqstp, __be32 *p, |
620 | struct nfsd3_attrstat *resp) | 620 | struct nfsd3_attrstat *resp) |
621 | { | 621 | { |
622 | if (resp->status == 0) | 622 | if (resp->status == 0) |
@@ -626,7 +626,7 @@ nfs3svc_encode_attrstat(struct svc_rqst *rqstp, u32 *p, | |||
626 | 626 | ||
627 | /* SETATTR, REMOVE, RMDIR */ | 627 | /* SETATTR, REMOVE, RMDIR */ |
628 | int | 628 | int |
629 | nfs3svc_encode_wccstat(struct svc_rqst *rqstp, u32 *p, | 629 | nfs3svc_encode_wccstat(struct svc_rqst *rqstp, __be32 *p, |
630 | struct nfsd3_attrstat *resp) | 630 | struct nfsd3_attrstat *resp) |
631 | { | 631 | { |
632 | p = encode_wcc_data(rqstp, p, &resp->fh); | 632 | p = encode_wcc_data(rqstp, p, &resp->fh); |
@@ -635,7 +635,7 @@ nfs3svc_encode_wccstat(struct svc_rqst *rqstp, u32 *p, | |||
635 | 635 | ||
636 | /* LOOKUP */ | 636 | /* LOOKUP */ |
637 | int | 637 | int |
638 | nfs3svc_encode_diropres(struct svc_rqst *rqstp, u32 *p, | 638 | nfs3svc_encode_diropres(struct svc_rqst *rqstp, __be32 *p, |
639 | struct nfsd3_diropres *resp) | 639 | struct nfsd3_diropres *resp) |
640 | { | 640 | { |
641 | if (resp->status == 0) { | 641 | if (resp->status == 0) { |
@@ -648,7 +648,7 @@ nfs3svc_encode_diropres(struct svc_rqst *rqstp, u32 *p, | |||
648 | 648 | ||
649 | /* ACCESS */ | 649 | /* ACCESS */ |
650 | int | 650 | int |
651 | nfs3svc_encode_accessres(struct svc_rqst *rqstp, u32 *p, | 651 | nfs3svc_encode_accessres(struct svc_rqst *rqstp, __be32 *p, |
652 | struct nfsd3_accessres *resp) | 652 | struct nfsd3_accessres *resp) |
653 | { | 653 | { |
654 | p = encode_post_op_attr(rqstp, p, &resp->fh); | 654 | p = encode_post_op_attr(rqstp, p, &resp->fh); |
@@ -659,7 +659,7 @@ nfs3svc_encode_accessres(struct svc_rqst *rqstp, u32 *p, | |||
659 | 659 | ||
660 | /* READLINK */ | 660 | /* READLINK */ |
661 | int | 661 | int |
662 | nfs3svc_encode_readlinkres(struct svc_rqst *rqstp, u32 *p, | 662 | nfs3svc_encode_readlinkres(struct svc_rqst *rqstp, __be32 *p, |
663 | struct nfsd3_readlinkres *resp) | 663 | struct nfsd3_readlinkres *resp) |
664 | { | 664 | { |
665 | p = encode_post_op_attr(rqstp, p, &resp->fh); | 665 | p = encode_post_op_attr(rqstp, p, &resp->fh); |
@@ -680,7 +680,7 @@ nfs3svc_encode_readlinkres(struct svc_rqst *rqstp, u32 *p, | |||
680 | 680 | ||
681 | /* READ */ | 681 | /* READ */ |
682 | int | 682 | int |
683 | nfs3svc_encode_readres(struct svc_rqst *rqstp, u32 *p, | 683 | nfs3svc_encode_readres(struct svc_rqst *rqstp, __be32 *p, |
684 | struct nfsd3_readres *resp) | 684 | struct nfsd3_readres *resp) |
685 | { | 685 | { |
686 | p = encode_post_op_attr(rqstp, p, &resp->fh); | 686 | p = encode_post_op_attr(rqstp, p, &resp->fh); |
@@ -704,7 +704,7 @@ nfs3svc_encode_readres(struct svc_rqst *rqstp, u32 *p, | |||
704 | 704 | ||
705 | /* WRITE */ | 705 | /* WRITE */ |
706 | int | 706 | int |
707 | nfs3svc_encode_writeres(struct svc_rqst *rqstp, u32 *p, | 707 | nfs3svc_encode_writeres(struct svc_rqst *rqstp, __be32 *p, |
708 | struct nfsd3_writeres *resp) | 708 | struct nfsd3_writeres *resp) |
709 | { | 709 | { |
710 | p = encode_wcc_data(rqstp, p, &resp->fh); | 710 | p = encode_wcc_data(rqstp, p, &resp->fh); |
@@ -719,7 +719,7 @@ nfs3svc_encode_writeres(struct svc_rqst *rqstp, u32 *p, | |||
719 | 719 | ||
720 | /* CREATE, MKDIR, SYMLINK, MKNOD */ | 720 | /* CREATE, MKDIR, SYMLINK, MKNOD */ |
721 | int | 721 | int |
722 | nfs3svc_encode_createres(struct svc_rqst *rqstp, u32 *p, | 722 | nfs3svc_encode_createres(struct svc_rqst *rqstp, __be32 *p, |
723 | struct nfsd3_diropres *resp) | 723 | struct nfsd3_diropres *resp) |
724 | { | 724 | { |
725 | if (resp->status == 0) { | 725 | if (resp->status == 0) { |
@@ -733,7 +733,7 @@ nfs3svc_encode_createres(struct svc_rqst *rqstp, u32 *p, | |||
733 | 733 | ||
734 | /* RENAME */ | 734 | /* RENAME */ |
735 | int | 735 | int |
736 | nfs3svc_encode_renameres(struct svc_rqst *rqstp, u32 *p, | 736 | nfs3svc_encode_renameres(struct svc_rqst *rqstp, __be32 *p, |
737 | struct nfsd3_renameres *resp) | 737 | struct nfsd3_renameres *resp) |
738 | { | 738 | { |
739 | p = encode_wcc_data(rqstp, p, &resp->ffh); | 739 | p = encode_wcc_data(rqstp, p, &resp->ffh); |
@@ -743,7 +743,7 @@ nfs3svc_encode_renameres(struct svc_rqst *rqstp, u32 *p, | |||
743 | 743 | ||
744 | /* LINK */ | 744 | /* LINK */ |
745 | int | 745 | int |
746 | nfs3svc_encode_linkres(struct svc_rqst *rqstp, u32 *p, | 746 | nfs3svc_encode_linkres(struct svc_rqst *rqstp, __be32 *p, |
747 | struct nfsd3_linkres *resp) | 747 | struct nfsd3_linkres *resp) |
748 | { | 748 | { |
749 | p = encode_post_op_attr(rqstp, p, &resp->fh); | 749 | p = encode_post_op_attr(rqstp, p, &resp->fh); |
@@ -753,7 +753,7 @@ nfs3svc_encode_linkres(struct svc_rqst *rqstp, u32 *p, | |||
753 | 753 | ||
754 | /* READDIR */ | 754 | /* READDIR */ |
755 | int | 755 | int |
756 | nfs3svc_encode_readdirres(struct svc_rqst *rqstp, u32 *p, | 756 | nfs3svc_encode_readdirres(struct svc_rqst *rqstp, __be32 *p, |
757 | struct nfsd3_readdirres *resp) | 757 | struct nfsd3_readdirres *resp) |
758 | { | 758 | { |
759 | p = encode_post_op_attr(rqstp, p, &resp->fh); | 759 | p = encode_post_op_attr(rqstp, p, &resp->fh); |
@@ -776,8 +776,8 @@ nfs3svc_encode_readdirres(struct svc_rqst *rqstp, u32 *p, | |||
776 | return xdr_ressize_check(rqstp, p); | 776 | return xdr_ressize_check(rqstp, p); |
777 | } | 777 | } |
778 | 778 | ||
779 | static inline u32 * | 779 | static inline __be32 * |
780 | encode_entry_baggage(struct nfsd3_readdirres *cd, u32 *p, const char *name, | 780 | encode_entry_baggage(struct nfsd3_readdirres *cd, __be32 *p, const char *name, |
781 | int namlen, ino_t ino) | 781 | int namlen, ino_t ino) |
782 | { | 782 | { |
783 | *p++ = xdr_one; /* mark entry present */ | 783 | *p++ = xdr_one; /* mark entry present */ |
@@ -790,8 +790,8 @@ encode_entry_baggage(struct nfsd3_readdirres *cd, u32 *p, const char *name, | |||
790 | return p; | 790 | return p; |
791 | } | 791 | } |
792 | 792 | ||
793 | static inline u32 * | 793 | static inline __be32 * |
794 | encode_entryplus_baggage(struct nfsd3_readdirres *cd, u32 *p, | 794 | encode_entryplus_baggage(struct nfsd3_readdirres *cd, __be32 *p, |
795 | struct svc_fh *fhp) | 795 | struct svc_fh *fhp) |
796 | { | 796 | { |
797 | p = encode_post_op_attr(cd->rqstp, p, fhp); | 797 | p = encode_post_op_attr(cd->rqstp, p, fhp); |
@@ -853,7 +853,7 @@ encode_entry(struct readdir_cd *ccd, const char *name, | |||
853 | { | 853 | { |
854 | struct nfsd3_readdirres *cd = container_of(ccd, struct nfsd3_readdirres, | 854 | struct nfsd3_readdirres *cd = container_of(ccd, struct nfsd3_readdirres, |
855 | common); | 855 | common); |
856 | u32 *p = cd->buffer; | 856 | __be32 *p = cd->buffer; |
857 | caddr_t curr_page_addr = NULL; | 857 | caddr_t curr_page_addr = NULL; |
858 | int pn; /* current page number */ | 858 | int pn; /* current page number */ |
859 | int slen; /* string (name) length */ | 859 | int slen; /* string (name) length */ |
@@ -919,7 +919,7 @@ encode_entry(struct readdir_cd *ccd, const char *name, | |||
919 | } else if (cd->rqstp->rq_respages[pn+1] != NULL) { | 919 | } else if (cd->rqstp->rq_respages[pn+1] != NULL) { |
920 | /* temporarily encode entry into next page, then move back to | 920 | /* temporarily encode entry into next page, then move back to |
921 | * current and next page in rq_respages[] */ | 921 | * current and next page in rq_respages[] */ |
922 | u32 *p1, *tmp; | 922 | __be32 *p1, *tmp; |
923 | int len1, len2; | 923 | int len1, len2; |
924 | 924 | ||
925 | /* grab next page for temporary storage of entry */ | 925 | /* grab next page for temporary storage of entry */ |
@@ -1009,7 +1009,7 @@ nfs3svc_encode_entry_plus(struct readdir_cd *cd, const char *name, | |||
1009 | 1009 | ||
1010 | /* FSSTAT */ | 1010 | /* FSSTAT */ |
1011 | int | 1011 | int |
1012 | nfs3svc_encode_fsstatres(struct svc_rqst *rqstp, u32 *p, | 1012 | nfs3svc_encode_fsstatres(struct svc_rqst *rqstp, __be32 *p, |
1013 | struct nfsd3_fsstatres *resp) | 1013 | struct nfsd3_fsstatres *resp) |
1014 | { | 1014 | { |
1015 | struct kstatfs *s = &resp->stats; | 1015 | struct kstatfs *s = &resp->stats; |
@@ -1031,7 +1031,7 @@ nfs3svc_encode_fsstatres(struct svc_rqst *rqstp, u32 *p, | |||
1031 | 1031 | ||
1032 | /* FSINFO */ | 1032 | /* FSINFO */ |
1033 | int | 1033 | int |
1034 | nfs3svc_encode_fsinfores(struct svc_rqst *rqstp, u32 *p, | 1034 | nfs3svc_encode_fsinfores(struct svc_rqst *rqstp, __be32 *p, |
1035 | struct nfsd3_fsinfores *resp) | 1035 | struct nfsd3_fsinfores *resp) |
1036 | { | 1036 | { |
1037 | *p++ = xdr_zero; /* no post_op_attr */ | 1037 | *p++ = xdr_zero; /* no post_op_attr */ |
@@ -1055,7 +1055,7 @@ nfs3svc_encode_fsinfores(struct svc_rqst *rqstp, u32 *p, | |||
1055 | 1055 | ||
1056 | /* PATHCONF */ | 1056 | /* PATHCONF */ |
1057 | int | 1057 | int |
1058 | nfs3svc_encode_pathconfres(struct svc_rqst *rqstp, u32 *p, | 1058 | nfs3svc_encode_pathconfres(struct svc_rqst *rqstp, __be32 *p, |
1059 | struct nfsd3_pathconfres *resp) | 1059 | struct nfsd3_pathconfres *resp) |
1060 | { | 1060 | { |
1061 | *p++ = xdr_zero; /* no post_op_attr */ | 1061 | *p++ = xdr_zero; /* no post_op_attr */ |
@@ -1074,7 +1074,7 @@ nfs3svc_encode_pathconfres(struct svc_rqst *rqstp, u32 *p, | |||
1074 | 1074 | ||
1075 | /* COMMIT */ | 1075 | /* COMMIT */ |
1076 | int | 1076 | int |
1077 | nfs3svc_encode_commitres(struct svc_rqst *rqstp, u32 *p, | 1077 | nfs3svc_encode_commitres(struct svc_rqst *rqstp, __be32 *p, |
1078 | struct nfsd3_commitres *resp) | 1078 | struct nfsd3_commitres *resp) |
1079 | { | 1079 | { |
1080 | p = encode_wcc_data(rqstp, p, &resp->fh); | 1080 | p = encode_wcc_data(rqstp, p, &resp->fh); |
@@ -1090,7 +1090,7 @@ nfs3svc_encode_commitres(struct svc_rqst *rqstp, u32 *p, | |||
1090 | * XDR release functions | 1090 | * XDR release functions |
1091 | */ | 1091 | */ |
1092 | int | 1092 | int |
1093 | nfs3svc_release_fhandle(struct svc_rqst *rqstp, u32 *p, | 1093 | nfs3svc_release_fhandle(struct svc_rqst *rqstp, __be32 *p, |
1094 | struct nfsd3_attrstat *resp) | 1094 | struct nfsd3_attrstat *resp) |
1095 | { | 1095 | { |
1096 | fh_put(&resp->fh); | 1096 | fh_put(&resp->fh); |
@@ -1098,7 +1098,7 @@ nfs3svc_release_fhandle(struct svc_rqst *rqstp, u32 *p, | |||
1098 | } | 1098 | } |
1099 | 1099 | ||
1100 | int | 1100 | int |
1101 | nfs3svc_release_fhandle2(struct svc_rqst *rqstp, u32 *p, | 1101 | nfs3svc_release_fhandle2(struct svc_rqst *rqstp, __be32 *p, |
1102 | struct nfsd3_fhandle_pair *resp) | 1102 | struct nfsd3_fhandle_pair *resp) |
1103 | { | 1103 | { |
1104 | fh_put(&resp->fh1); | 1104 | fh_put(&resp->fh1); |