diff options
author | Al Viro <viro@ftp.linux.org.uk> | 2006-10-20 02:28:55 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-20 13:26:41 -0400 |
commit | ad451d389f46f699832da3e9ad95f610cb8c0fd2 (patch) | |
tree | d77b6cb5277ef53b8a1433b37a68994806ee5431 /fs/nfsd/nfssvc.c | |
parent | 83b11340d683a67a77e35a5ffb5ad4afbf0be4e5 (diff) |
[PATCH] xdr annotations: nfsd_dispatch()
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/nfssvc.c')
-rw-r--r-- | fs/nfsd/nfssvc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c index 013b38996e64..8067118b1c0c 100644 --- a/fs/nfsd/nfssvc.c +++ b/fs/nfsd/nfssvc.c | |||
@@ -495,8 +495,8 @@ nfsd_dispatch(struct svc_rqst *rqstp, u32 *statp) | |||
495 | { | 495 | { |
496 | struct svc_procedure *proc; | 496 | struct svc_procedure *proc; |
497 | kxdrproc_t xdr; | 497 | kxdrproc_t xdr; |
498 | u32 nfserr; | 498 | __be32 nfserr; |
499 | u32 *nfserrp; | 499 | __be32 *nfserrp; |
500 | 500 | ||
501 | dprintk("nfsd_dispatch: vers %d proc %d\n", | 501 | dprintk("nfsd_dispatch: vers %d proc %d\n", |
502 | rqstp->rq_vers, rqstp->rq_proc); | 502 | rqstp->rq_vers, rqstp->rq_proc); |
@@ -515,7 +515,7 @@ nfsd_dispatch(struct svc_rqst *rqstp, u32 *statp) | |||
515 | 515 | ||
516 | /* Decode arguments */ | 516 | /* Decode arguments */ |
517 | xdr = proc->pc_decode; | 517 | xdr = proc->pc_decode; |
518 | if (xdr && !xdr(rqstp, (u32*)rqstp->rq_arg.head[0].iov_base, | 518 | if (xdr && !xdr(rqstp, (__be32*)rqstp->rq_arg.head[0].iov_base, |
519 | rqstp->rq_argp)) { | 519 | rqstp->rq_argp)) { |
520 | dprintk("nfsd: failed to decode arguments!\n"); | 520 | dprintk("nfsd: failed to decode arguments!\n"); |
521 | nfsd_cache_update(rqstp, RC_NOCACHE, NULL); | 521 | nfsd_cache_update(rqstp, RC_NOCACHE, NULL); |
@@ -528,7 +528,7 @@ nfsd_dispatch(struct svc_rqst *rqstp, u32 *statp) | |||
528 | */ | 528 | */ |
529 | nfserrp = rqstp->rq_res.head[0].iov_base | 529 | nfserrp = rqstp->rq_res.head[0].iov_base |
530 | + rqstp->rq_res.head[0].iov_len; | 530 | + rqstp->rq_res.head[0].iov_len; |
531 | rqstp->rq_res.head[0].iov_len += sizeof(u32); | 531 | rqstp->rq_res.head[0].iov_len += sizeof(__be32); |
532 | 532 | ||
533 | /* Now call the procedure handler, and encode NFS status. */ | 533 | /* Now call the procedure handler, and encode NFS status. */ |
534 | nfserr = proc->pc_func(rqstp, rqstp->rq_argp, rqstp->rq_resp); | 534 | nfserr = proc->pc_func(rqstp, rqstp->rq_argp, rqstp->rq_resp); |