diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2017-02-23 14:53:39 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-03-12 00:41:51 -0500 |
| commit | 3f22cc6f5ca335de95a49e9a217efaf1034e26ae (patch) | |
| tree | 551f31b1096cdf4c70bd54250a6136671ea964f4 /fs | |
| parent | c65db336d6c6f82e30e0bdb771517297db8e880e (diff) | |
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>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/nfs/nfs4xdr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c index fc89e5ed07ee..c9c4d9855976 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, | |||
| 2492 | encode_compound_hdr(xdr, req, &hdr); | 2492 | encode_compound_hdr(xdr, req, &hdr); |
| 2493 | encode_sequence(xdr, &args->seq_args, &hdr); | 2493 | encode_sequence(xdr, &args->seq_args, &hdr); |
| 2494 | encode_putfh(xdr, args->fh, &hdr); | 2494 | encode_putfh(xdr, args->fh, &hdr); |
| 2495 | replen = hdr.replen + op_decode_hdr_maxsz + 1; | 2495 | replen = hdr.replen + op_decode_hdr_maxsz; |
| 2496 | encode_getattr_two(xdr, FATTR4_WORD0_ACL, 0, &hdr); | 2496 | encode_getattr_two(xdr, FATTR4_WORD0_ACL, 0, &hdr); |
| 2497 | 2497 | ||
| 2498 | xdr_inline_pages(&req->rq_rcv_buf, replen << 2, | 2498 | xdr_inline_pages(&req->rq_rcv_buf, replen << 2, |