lkml.org 
[lkml]   [2020]   [Dec]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 269/717] NFSv4: Fix the alignment of page data in the getdeviceinfo reply
    Date
    From: Trond Myklebust <trond.myklebust@hammerspace.com>

    [ Upstream commit 046e5ccb4198b990190e11fb52fd9cfd264402eb ]

    We can fit the device_addr4 opaque data padding in the pages.

    Fixes: cf500bac8fd4 ("SUNRPC: Introduce rpc_prepare_reply_pages()")
    Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    fs/nfs/nfs4xdr.c | 10 +++++++---
    1 file changed, 7 insertions(+), 3 deletions(-)

    diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c
    index c6dbfcae75171..c16b93df1bc14 100644
    --- a/fs/nfs/nfs4xdr.c
    +++ b/fs/nfs/nfs4xdr.c
    @@ -3009,15 +3009,19 @@ static void nfs4_xdr_enc_getdeviceinfo(struct rpc_rqst *req,
    struct compound_hdr hdr = {
    .minorversion = nfs4_xdr_minorversion(&args->seq_args),
    };
    + uint32_t replen;

    encode_compound_hdr(xdr, req, &hdr);
    encode_sequence(xdr, &args->seq_args, &hdr);
    +
    + replen = hdr.replen + op_decode_hdr_maxsz;
    +
    encode_getdeviceinfo(xdr, args, &hdr);

    - /* set up reply kvec. Subtract notification bitmap max size (2)
    - * so that notification bitmap is put in xdr_buf tail */
    + /* set up reply kvec. device_addr4 opaque data is read into the
    + * pages */
    rpc_prepare_reply_pages(req, args->pdev->pages, args->pdev->pgbase,
    - args->pdev->pglen, hdr.replen - 2);
    + args->pdev->pglen, replen + 2 + 1);
    encode_nops(&hdr);
    }

    --
    2.27.0


    \
     
     \ /
      Last update: 2020-12-28 16:06    [W:2.707 / U:0.216 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site