Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6682c14b authored by J. Bruce Fields's avatar J. Bruce Fields Committed by Anna Schumaker
Browse files

NFSv4: fix getacl head length estimation 



Bitmap and attrlen follow immediately after the op reply header.  This
was an oversight from commit bf118a34.

Consequences of this are just minor efficiency (extra calls to
xdr_shrink_bufhead).

Fixes: bf118a34 "NFSv4: include bitmap in nfsv4 get acl data"
Reviewed-by: default avatarKinglong Mee <kinglongmee@gmail.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent a5e14c93

fs/nfs/nfs4xdr.c

+1 −1
Original line number Diff line number Diff line
@@ -2514,7 +2514,7 @@ static void nfs4_xdr_enc_getacl(struct rpc_rqst *req, struct xdr_stream *xdr, 
	encode_compound_hdr(xdr, req, &hdr);

	encode_sequence(xdr, &args->seq_args, &hdr);

	encode_putfh(xdr, args->fh, &hdr);

	replen = hdr.replen + op_decode_hdr_maxsz + 1;

	replen = hdr.replen + op_decode_hdr_maxsz;

	encode_getattr_two(xdr, FATTR4_WORD0_ACL, 0, &hdr);



	xdr_inline_pages(&req->rq_rcv_buf, replen << 2,