NFSD: Replace READ* macros in nfsd4_decode_locku()

[ Upstream commit ca9cf9fc27f8f722e9eb2763173ba01f6ac3dad1 ]

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Chuck Lever 2020-11-03 13:33:28 -05:00 committed by Ksawlii
parent 72c0941906
commit ab2c8c85dc

View file

@ -909,21 +909,23 @@ nfsd4_decode_lockt(struct nfsd4_compoundargs *argp, struct nfsd4_lockt *lockt)
static __be32
nfsd4_decode_locku(struct nfsd4_compoundargs *argp, struct nfsd4_locku *locku)
{
DECODE_HEAD;
__be32 status;
READ_BUF(8);
locku->lu_type = be32_to_cpup(p++);
if (xdr_stream_decode_u32(argp->xdr, &locku->lu_type) < 0)
return nfserr_bad_xdr;
if ((locku->lu_type < NFS4_READ_LT) || (locku->lu_type > NFS4_WRITEW_LT))
goto xdr_error;
locku->lu_seqid = be32_to_cpup(p++);
status = nfsd4_decode_stateid(argp, &locku->lu_stateid);
return nfserr_bad_xdr;
if (xdr_stream_decode_u32(argp->xdr, &locku->lu_seqid) < 0)
return nfserr_bad_xdr;
status = nfsd4_decode_stateid4(argp, &locku->lu_stateid);
if (status)
return status;
READ_BUF(16);
p = xdr_decode_hyper(p, &locku->lu_offset);
p = xdr_decode_hyper(p, &locku->lu_length);
if (xdr_stream_decode_u64(argp->xdr, &locku->lu_offset) < 0)
return nfserr_bad_xdr;
if (xdr_stream_decode_u64(argp->xdr, &locku->lu_length) < 0)
return nfserr_bad_xdr;
DECODE_TAIL;
return nfs_ok;
}
static __be32