[PATCH 3.2 019/110] NFS: Fix size of NFSACL SETACL operations
From: Ben Hutchings <hidden>
Date: 2015-08-10 10:17:04
Also in:
lkml
From: Ben Hutchings <hidden>
Date: 2015-08-10 10:17:04
Also in:
lkml
3.2.71-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Chuck Lever <redacted>
commit d683cc49daf7c5afca8cd9654aaa1bf63cdf2ad9 upstream.
When encoding the NFSACL SETACL operation, reserve just the estimated
size of the ACL rather than a fixed maximum. This eliminates needless
zero padding on the wire that the server ignores.
Fixes: ee5dc7732bd5 ('NFS: Fix "kernel BUG at fs/nfs/nfs3xdr.c:1338!"')
Signed-off-by: Chuck Lever <redacted>
Signed-off-by: Trond Myklebust <redacted>
Signed-off-by: Ben Hutchings <redacted>
---
fs/nfs/nfs3xdr.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/fs/nfs/nfs3xdr.c
+++ b/fs/nfs/nfs3xdr.c@@ -1333,7 +1333,7 @@ static void nfs3_xdr_enc_setacl3args(str if (args->npages != 0) xdr_write_pages(xdr, args->pages, 0, args->len); else - xdr_reserve_space(xdr, NFS_ACL_INLINE_BUFSIZE); + xdr_reserve_space(xdr, args->len); error = nfsacl_encode(xdr->buf, base, args->inode, (args->mask & NFS_ACL) ?