NFSD: Replace READ* macros in nfsd4_decode_secinfo_no_name()
[ Upstream commit 53d70873e37c09a582167ed73d1858e3a2af0157 ] Signed-off-by: Chuck Lever <chuck.lever@oracle.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:

committed by
Greg Kroah-Hartman

parent
b63e313dce
commit
1ea743dc48
@@ -1356,17 +1356,6 @@ nfsd4_decode_secinfo(struct nfsd4_compoundargs *argp,
|
|||||||
return nfsd4_decode_component4(argp, &secinfo->si_name, &secinfo->si_namelen);
|
return nfsd4_decode_component4(argp, &secinfo->si_name, &secinfo->si_namelen);
|
||||||
}
|
}
|
||||||
|
|
||||||
static __be32
|
|
||||||
nfsd4_decode_secinfo_no_name(struct nfsd4_compoundargs *argp,
|
|
||||||
struct nfsd4_secinfo_no_name *sin)
|
|
||||||
{
|
|
||||||
DECODE_HEAD;
|
|
||||||
|
|
||||||
READ_BUF(4);
|
|
||||||
sin->sin_style = be32_to_cpup(p++);
|
|
||||||
DECODE_TAIL;
|
|
||||||
}
|
|
||||||
|
|
||||||
static __be32
|
static __be32
|
||||||
nfsd4_decode_setattr(struct nfsd4_compoundargs *argp, struct nfsd4_setattr *setattr)
|
nfsd4_decode_setattr(struct nfsd4_compoundargs *argp, struct nfsd4_setattr *setattr)
|
||||||
{
|
{
|
||||||
@@ -1918,6 +1907,14 @@ nfsd4_decode_layoutreturn(struct nfsd4_compoundargs *argp,
|
|||||||
}
|
}
|
||||||
#endif /* CONFIG_NFSD_PNFS */
|
#endif /* CONFIG_NFSD_PNFS */
|
||||||
|
|
||||||
|
static __be32 nfsd4_decode_secinfo_no_name(struct nfsd4_compoundargs *argp,
|
||||||
|
struct nfsd4_secinfo_no_name *sin)
|
||||||
|
{
|
||||||
|
if (xdr_stream_decode_u32(argp->xdr, &sin->sin_style) < 0)
|
||||||
|
return nfserr_bad_xdr;
|
||||||
|
return nfs_ok;
|
||||||
|
}
|
||||||
|
|
||||||
static __be32
|
static __be32
|
||||||
nfsd4_decode_fallocate(struct nfsd4_compoundargs *argp,
|
nfsd4_decode_fallocate(struct nfsd4_compoundargs *argp,
|
||||||
struct nfsd4_fallocate *fallocate)
|
struct nfsd4_fallocate *fallocate)
|
||||||
|
Reference in New Issue
Block a user