The patch titled
xdr annotations: nfsd_dispatch()
has been removed from the -mm tree. Its filename was
xdr-annotations-nfsd_dispatch.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: xdr annotations: nfsd_dispatch()
From: Al Viro <viro@xxxxxxxxxxxxxxxx>
Signed-off-by: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Acked-by: Trond Myklebust <trond.myklebust@xxxxxxxxxx>
Acked-by: Neil Brown <neilb@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
fs/nfsd/nfssvc.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff -puN fs/nfsd/nfssvc.c~xdr-annotations-nfsd_dispatch fs/nfsd/nfssvc.c
--- a/fs/nfsd/nfssvc.c~xdr-annotations-nfsd_dispatch
+++ a/fs/nfsd/nfssvc.c
@@ -495,8 +495,8 @@ nfsd_dispatch(struct svc_rqst *rqstp, u3
{
struct svc_procedure *proc;
kxdrproc_t xdr;
- u32 nfserr;
- u32 *nfserrp;
+ __be32 nfserr;
+ __be32 *nfserrp;
dprintk("nfsd_dispatch: vers %d proc %d\n",
rqstp->rq_vers, rqstp->rq_proc);
@@ -515,7 +515,7 @@ nfsd_dispatch(struct svc_rqst *rqstp, u3
/* Decode arguments */
xdr = proc->pc_decode;
- if (xdr && !xdr(rqstp, (u32*)rqstp->rq_arg.head[0].iov_base,
+ if (xdr && !xdr(rqstp, (__be32*)rqstp->rq_arg.head[0].iov_base,
rqstp->rq_argp)) {
dprintk("nfsd: failed to decode arguments!\n");
nfsd_cache_update(rqstp, RC_NOCACHE, NULL);
@@ -528,7 +528,7 @@ nfsd_dispatch(struct svc_rqst *rqstp, u3
*/
nfserrp = rqstp->rq_res.head[0].iov_base
+ rqstp->rq_res.head[0].iov_len;
- rqstp->rq_res.head[0].iov_len += sizeof(u32);
+ rqstp->rq_res.head[0].iov_len += sizeof(__be32);
/* Now call the procedure handler, and encode NFS status. */
nfserr = proc->pc_func(rqstp, rqstp->rq_argp, rqstp->rq_resp);
_
Patches currently in -mm which might be from viro@xxxxxxxxxxxxxxxx are
origin.patch
git-netdev-all.patch
slab-leaks3-default-y.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
