Commit 393c31dd authored by Chuck Lever's avatar Chuck Lever
Browse files

NFSD: Replace READ* macros that decode the fattr4 owner_group attribute 



Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
parent 9853a5ac

fs/nfsd/nfs4xdr.c

+10 −5
Original line number Diff line number Diff line
@@ -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;

	}