diff options
| author | Chuck Lever <chuck.lever@oracle.com> | 2020-11-04 13:42:25 -0500 |
|---|---|---|
| committer | Chuck Lever <chuck.lever@oracle.com> | 2020-11-30 14:46:40 -0500 |
| commit | a4a80c15ca4dd998ab5cbe87bd856c626a318a80 (patch) | |
| tree | 1dd1e60c5d4c13574843a48c28109e15f64277fd /fs/nfsd/nfs4xdr.c | |
| parent | 244e2befcba80f42c65293b6c56282bb78f9f417 (diff) | |
| download | linux-a4a80c15ca4dd998ab5cbe87bd856c626a318a80.tar.gz | |
NFSD: Replace READ* macros in nfsd4_decode_release_lockowner()
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Diffstat (limited to 'fs/nfsd/nfs4xdr.c')
| -rw-r--r-- | fs/nfsd/nfs4xdr.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c index 8e960cdc351d..667f6d9314a7 100644 --- a/fs/nfsd/nfs4xdr.c +++ b/fs/nfsd/nfs4xdr.c @@ -1418,20 +1418,20 @@ nfsd4_decode_write(struct nfsd4_compoundargs *argp, struct nfsd4_write *write) static __be32 nfsd4_decode_release_lockowner(struct nfsd4_compoundargs *argp, struct nfsd4_release_lockowner *rlockowner) { - DECODE_HEAD; + __be32 status; if (argp->minorversion >= 1) return nfserr_notsupp; - READ_BUF(12); - COPYMEM(&rlockowner->rl_clientid, sizeof(clientid_t)); - rlockowner->rl_owner.len = be32_to_cpup(p++); - READ_BUF(rlockowner->rl_owner.len); - READMEM(rlockowner->rl_owner.data, rlockowner->rl_owner.len); + status = nfsd4_decode_state_owner4(argp, &rlockowner->rl_clientid, + &rlockowner->rl_owner); + if (status) + return status; if (argp->minorversion && !zero_clientid(&rlockowner->rl_clientid)) return nfserr_inval; - DECODE_TAIL; + + return nfs_ok; } static __be32 |