diff options
| author |   Chuck Lever <chuck.lever@oracle.com> | 2015-05-26 11:53:52 -0400 |
|---|---|---|
| committer |   Trond Myklebust <trond.myklebust@primarydata.com> | 2015-06-02 08:55:28 -0400 |
| commit | d683cc49daf7c5afca8cd9654aaa1bf63cdf2ad9 (patch) | |
| tree | fdff769a43b7d2b03b8371b304a4fccb42b55415 /fs/nfs/nfs3xdr.c | |
| parent | NFS: report more appropriate block size for directories. (diff) | |
| download | linux-dev-d683cc49daf7c5afca8cd9654aaa1bf63cdf2ad9.tar.xz linux-dev-d683cc49daf7c5afca8cd9654aaa1bf63cdf2ad9.zip | |
NFS: Fix size of NFSACL SETACL operations
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>
Diffstat (limited to 'fs/nfs/nfs3xdr.c')
| -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 53852a4bd88b..9b04c2e6fffc 100644 --- a/fs/nfs/nfs3xdr.c +++ b/fs/nfs/nfs3xdr.c @@ -1342,7 +1342,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) ? |