NFSD: Update the NFSv2 RENAME argument decoder to use struct xdr_stream

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>

diff --git a/fs/nfsd/nfsxdr.c b/fs/nfsd/nfsxdr.c
index 00a7db8..d4f4729 100644 (file)
--- a/fs/nfsd/nfsxdr.c
+++ b/fs/nfsd/nfsxdr.c
@@ -344,15 +344,13 @@ nfssvc_decode_createargs(struct svc_rqst *rqstp, __be32 *p)
 int
 nfssvc_decode_renameargs(struct svc_rqst *rqstp, __be32 *p)
 {
+       struct xdr_stream *xdr = &rqstp->rq_arg_stream;
        struct nfsd_renameargs *args = rqstp->rq_argp;
 
-       if (!(p = decode_fh(p, &args->ffh))
-        || !(p = decode_filename(p, &args->fname, &args->flen))
-        || !(p = decode_fh(p, &args->tfh))
-        || !(p = decode_filename(p, &args->tname, &args->tlen)))
-               return 0;
-
-       return xdr_argsize_check(rqstp, p);
+       return svcxdr_decode_diropargs(xdr, &args->ffh,
+                                      &args->fname, &args->flen) &&
+               svcxdr_decode_diropargs(xdr, &args->tfh,
+                                       &args->tname, &args->tlen);
 }
 
 int