| From 64f15f56d537cedc168429726f6abe6df23138d7 Mon Sep 17 00:00:00 2001 |
| From: "J. Bruce Fields" <bfields@redhat.com> |
| Date: Thu, 23 Feb 2017 14:53:39 -0500 |
| Subject: [PATCH] NFSv4: fix getacl head length estimation |
| |
| commit 6682c14bbe505a8b912c57faf544f866777ee48d upstream. |
| |
| Bitmap and attrlen follow immediately after the op reply header. This |
| was an oversight from commit bf118a342f. |
| |
| Consequences of this are just minor efficiency (extra calls to |
| xdr_shrink_bufhead). |
| |
| Fixes: bf118a342f10 "NFSv4: include bitmap in nfsv4 get acl data" |
| Reviewed-by: Kinglong Mee <kinglongmee@gmail.com> |
| Cc: stable@vger.kernel.org |
| Signed-off-by: J. Bruce Fields <bfields@redhat.com> |
| Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c |
| index 7bd3a5c09d31..5111671ff994 100644 |
| --- a/fs/nfs/nfs4xdr.c |
| +++ b/fs/nfs/nfs4xdr.c |
| @@ -2492,7 +2492,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, |
| -- |
| 2.12.0 |
| |
