aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfsd
diff options
context:
space:
mode:
authorChuck Lever <chuck.lever@oracle.com>2020-10-21 12:34:24 -0400
committerChuck Lever <chuck.lever@oracle.com>2021-01-25 09:36:26 -0500
commit77edcdf91f6245a9881b84e4e101738148bd039a (patch)
treea4fd9e1fa98ca9a29e3098f064fe1fc3c7b44a58 /fs/nfsd
parentNFSD: Update the NFSv2 RENAME argument decoder to use struct xdr_stream (diff)
downloadlinux-dev-77edcdf91f6245a9881b84e4e101738148bd039a.tar.xz
linux-dev-77edcdf91f6245a9881b84e4e101738148bd039a.zip
NFSD: Update the NFSv2 LINK argument decoder to use struct xdr_stream
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Diffstat (limited to 'fs/nfsd')
-rw-r--r--fs/nfsd/nfsxdr.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/fs/nfsd/nfsxdr.c b/fs/nfsd/nfsxdr.c
index d4f4729c7b1c..3d0fe03a3fb9 100644
--- a/fs/nfsd/nfsxdr.c
+++ b/fs/nfsd/nfsxdr.c
@@ -356,14 +356,12 @@ nfssvc_decode_renameargs(struct svc_rqst *rqstp, __be32 *p)
int
nfssvc_decode_linkargs(struct svc_rqst *rqstp, __be32 *p)
{
+ struct xdr_stream *xdr = &rqstp->rq_arg_stream;
struct nfsd_linkargs *args = rqstp->rq_argp;
- if (!(p = decode_fh(p, &args->ffh))
- || !(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_fhandle(xdr, &args->ffh) &&
+ svcxdr_decode_diropargs(xdr, &args->tfh,
+ &args->tname, &args->tlen);
}
int