NFSD: Replace READ* macros in nfsd4_decode_write()

[ Upstream commit 244e2befcba80f42c65293b6c56282bb78f9f417 ]

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 231a2628e3e6f9e55a2c283cd4369eba9ad43926..26744b7f0e35c6783842ab39a1180e848dec5a1c 100644 (file)
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -1396,22 +1396,23 @@ nfsd4_decode_verify(struct nfsd4_compoundargs *argp, struct nfsd4_verify *verify
 static __be32
 nfsd4_decode_write(struct nfsd4_compoundargs *argp, struct nfsd4_write *write)
 {
-       DECODE_HEAD;
+       __be32 status;
 
-       status = nfsd4_decode_stateid(argp, &write->wr_stateid);
+       status = nfsd4_decode_stateid4(argp, &write->wr_stateid);
        if (status)
                return status;
-       READ_BUF(16);
-       p = xdr_decode_hyper(p, &write->wr_offset);
-       write->wr_stable_how = be32_to_cpup(p++);
+       if (xdr_stream_decode_u64(argp->xdr, &write->wr_offset) < 0)
+               return nfserr_bad_xdr;
+       if (xdr_stream_decode_u32(argp->xdr, &write->wr_stable_how) < 0)
+               return nfserr_bad_xdr;
        if (write->wr_stable_how > NFS_FILE_SYNC)
-               goto xdr_error;
-       write->wr_buflen = be32_to_cpup(p++);
-
+               return nfserr_bad_xdr;
+       if (xdr_stream_decode_u32(argp->xdr, &write->wr_buflen) < 0)
+               return nfserr_bad_xdr;
        if (!xdr_stream_subsegment(argp->xdr, &write->wr_payload, write->wr_buflen))
-               goto xdr_error;
+               return nfserr_bad_xdr;
 
-       DECODE_TAIL;
+       return nfs_ok;
 }
 
 static __be32