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

Commit d327cf74 authored by J. Bruce Fields's avatar J. Bruce Fields Committed by Trond Myklebust
Browse files

Re: acl trouble after upgrading ubuntu 



Subject: [PATCH] nfs: fix acl decoding

Commit 28f56694 "NFS: use dynamically
computed compound_hdr.replen for xdr_inline_pages offset" accidentally
changed the amount of space to allow for the acl reply, resulting in an
IO error on attempts to get an acl.

Reported-by: default avatarPaul Rudin <paul@rudin.co.uk>
Cc: Benny Halevy <bhalevy@panasas.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent f0380f3d

fs/nfs/nfs4xdr.c

+1 −1
Original line number Diff line number Diff line
@@ -2096,7 +2096,7 @@ nfs4_xdr_enc_getacl(struct rpc_rqst *req, __be32 *p, 
	encode_compound_hdr(&xdr, req, &hdr);

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

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

	replen = hdr.replen + nfs4_fattr_bitmap_maxsz + 1;

	replen = hdr.replen + op_decode_hdr_maxsz + nfs4_fattr_bitmap_maxsz + 1;

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



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