NFSD: Replace READ* macros that decode the fattr4 owner_group attribute
[ Upstream commit 393c31dd27f83adb06b07a1b5f0a5b8966a0f01e ] Signed-off-by: Chuck Lever <chuck.lever@oracle.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
4d043b60f5
commit
a98e2e0e51
1 changed files with 10 additions and 5 deletions
|
@ -374,11 +374,16 @@ nfsd4_decode_fattr(struct nfsd4_compoundargs *argp, u32 *bmval,
|
|||
iattr->ia_valid |= ATTR_UID;
|
||||
}
|
||||
if (bmval[1] & FATTR4_WORD1_OWNER_GROUP) {
|
||||
READ_BUF(4);
|
||||
dummy32 = be32_to_cpup(p++);
|
||||
READ_BUF(dummy32);
|
||||
READMEM(buf, dummy32);
|
||||
if ((status = nfsd_map_name_to_gid(argp->rqstp, buf, dummy32, &iattr->ia_gid)))
|
||||
u32 length;
|
||||
|
||||
if (xdr_stream_decode_u32(argp->xdr, &length) < 0)
|
||||
return nfserr_bad_xdr;
|
||||
p = xdr_inline_decode(argp->xdr, length);
|
||||
if (!p)
|
||||
return nfserr_bad_xdr;
|
||||
status = nfsd_map_name_to_gid(argp->rqstp, (char *)p, length,
|
||||
&iattr->ia_gid);
|
||||
if (status)
|
||||
return status;
|
||||
iattr->ia_valid |= ATTR_GID;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue