NFSD: Replace READ* macros in nfsd4_decode_fallocate()
authorChuck Lever <chuck.lever@oracle.com>
Wed, 4 Nov 2020 15:44:05 +0000 (10:44 -0500)
committerChuck Lever <chuck.lever@oracle.com>
Mon, 30 Nov 2020 19:46:42 +0000 (14:46 -0500)
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
fs/nfsd/nfs4xdr.c

index 59f89af..b9f448d 100644 (file)
@@ -1906,17 +1906,17 @@ static __be32
 nfsd4_decode_fallocate(struct nfsd4_compoundargs *argp,
                       struct nfsd4_fallocate *fallocate)
 {
-       DECODE_HEAD;
+       __be32 status;
 
-       status = nfsd4_decode_stateid(argp, &fallocate->falloc_stateid);
+       status = nfsd4_decode_stateid4(argp, &fallocate->falloc_stateid);
        if (status)
                return status;
+       if (xdr_stream_decode_u64(argp->xdr, &fallocate->falloc_offset) < 0)
+               return nfserr_bad_xdr;
+       if (xdr_stream_decode_u64(argp->xdr, &fallocate->falloc_length) < 0)
+               return nfserr_bad_xdr;
 
-       READ_BUF(16);
-       p = xdr_decode_hyper(p, &fallocate->falloc_offset);
-       xdr_decode_hyper(p, &fallocate->falloc_length);
-
-       DECODE_TAIL;
+       return nfs_ok;
 }
 
 static __be32