diff options
| author | Chuck Lever <chuck.lever@oracle.com> | 2015-05-26 11:53:52 -0400 |
|---|---|---|
| committer | Zefan Li <lizefan@huawei.com> | 2015-10-22 09:20:03 +0800 |
| commit | 3c868f46dd3a85f700b5c3558854ade350d716a6 (patch) | |
| tree | e6c28f80423a67ed4fff8c20959400f4de5b9352 | |
| parent | 9fdaa2147db4599620563aba79e99dedc15aacf7 (diff) | |
| download | lwn-3c868f46dd3a85f700b5c3558854ade350d716a6.tar.gz lwn-3c868f46dd3a85f700b5c3558854ade350d716a6.zip | |
NFS: Fix size of NFSACL SETACL operations
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 <chuck.lever@oracle.com>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: Zefan Li <lizefan@huawei.com>
| -rw-r--r-- | fs/nfs/nfs3xdr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/nfs3xdr.c b/fs/nfs/nfs3xdr.c index a77cc9a3ce55..e60bbe2ff5a8 100644 --- a/fs/nfs/nfs3xdr.c +++ b/fs/nfs/nfs3xdr.c @@ -1333,7 +1333,7 @@ static void nfs3_xdr_enc_setacl3args(struct rpc_rqst *req, 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) ? |