lkml.org 
[lkml]   [2015]   [Jul]   [31]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.1 244/267] NFS: Fix size of NFSACL SETACL operations
    Date
    4.1-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Chuck Lever <chuck.lever@oracle.com>

    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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    fs/nfs/nfs3xdr.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/fs/nfs/nfs3xdr.c
    +++ b/fs/nfs/nfs3xdr.c
    @@ -1342,7 +1342,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) ?



    \
     
     \ /
      Last update: 2015-07-31 22:21    [W:4.161 / U:0.060 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site