[PATCH 5.4 202/453] NFSv4: Fix the alignment of page data in the getdeviceinfo reply

[Greg Kroah-Hartman]

From: Trond Myklebust <trond.mykleb...@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.mykleb...@hammerspace.com>
Signed-off-by: Sasha Levin <sas...@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 677751bc3a334..9a022a4fb9643 100644
--- a/fs/nfs/nfs4xdr.c
+++ b/fs/nfs/nfs4xdr.c
@@ -3012,15 +3012,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