NFSD: Replace READ* macros in nfsd4_decode_read()

[ Upstream commit 3909c3bc604688503e31ddceb429dc156c4720c1 ]

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
index 149948393ccb1709949e9ca0bc42cb7441dcd48c..c9652040d748ba76d0b2e766571ba7c2a544c474 100644 (file)
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -1218,16 +1218,17 @@ nfsd4_decode_putpubfh(struct nfsd4_compoundargs *argp, void *p)
 static __be32
 nfsd4_decode_read(struct nfsd4_compoundargs *argp, struct nfsd4_read *read)
 {
-       DECODE_HEAD;
+       __be32 status;
 
-       status = nfsd4_decode_stateid(argp, &read->rd_stateid);
+       status = nfsd4_decode_stateid4(argp, &read->rd_stateid);
        if (status)
                return status;
-       READ_BUF(12);
-       p = xdr_decode_hyper(p, &read->rd_offset);
-       read->rd_length = be32_to_cpup(p++);
+       if (xdr_stream_decode_u64(argp->xdr, &read->rd_offset) < 0)
+               return nfserr_bad_xdr;
+       if (xdr_stream_decode_u32(argp->xdr, &read->rd_length) < 0)
+               return nfserr_bad_xdr;
 
-       DECODE_TAIL;
+       return nfs_ok;
 }
 
 static __be32