diff options
| author |  Chuck Lever <chuck.lever@oracle.com>
| 2020-11-17 11:46:50 -0500 |
|---|---|---|
| committer | Chuck Lever <chuck.lever@oracle.com>
| 2021-01-25 09:36:27 -0500 |
| commit | 571d31f37a57729c9d3463b5a692a84e619b408a (patch) | |
| tree | be463446b96c83c0cfe643dd1077a2eb3a4a3552 /fs/nfsd | |
| parent | NFSD: Update the NFSv2 SETACL argument decoder to use struct xdr_stream (diff) | |
| download | linux-571d31f37a57729c9d3463b5a692a84e619b408a.tar.gz linux-571d31f37a57729c9d3463b5a692a84e619b408a.tar.bz2 linux-571d31f37a57729c9d3463b5a692a84e619b408a.zip | |
NFSD: Update the NFSv2 ACL GETATTR argument decoder to use struct xdr_stream
Since the ACL GETATTR procedure is the same as the normal GETATTR
procedure, simply re-use nfssvc_decode_fhandleargs.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Diffstat (limited to 'fs/nfsd')
| -rw-r--r-- | fs/nfsd/nfs2acl.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/fs/nfsd/nfs2acl.c b/fs/nfsd/nfs2acl.c index 123820ec79d3..0274348f6679 100644 --- a/fs/nfsd/nfs2acl.c +++ b/fs/nfsd/nfs2acl.c @@ -220,16 +220,6 @@ static int nfsaclsvc_decode_setaclargs(struct svc_rqst *rqstp, __be32 *p) return 1; } -static int nfsaclsvc_decode_fhandleargs(struct svc_rqst *rqstp, __be32 *p) -{ - struct nfsd_fhandle *argp = rqstp->rq_argp; - - p = nfs2svc_decode_fh(p, &argp->fh); - if (!p) - return 0; - return xdr_argsize_check(rqstp, p); -} - static int nfsaclsvc_decode_accessargs(struct svc_rqst *rqstp, __be32 *p) { struct nfsd3_accessargs *argp = rqstp->rq_argp; @@ -392,7 +382,7 @@ static const struct svc_procedure nfsd_acl_procedures2[5] = { }, [ACLPROC2_GETATTR] = { .pc_func = nfsacld_proc_getattr, - .pc_decode = nfsaclsvc_decode_fhandleargs, + .pc_decode = nfssvc_decode_fhandleargs, .pc_encode = nfsaclsvc_encode_attrstatres, .pc_release = nfsaclsvc_release_attrstat, .pc_argsize = sizeof(struct nfsd_fhandle), |