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

index 74ca448..a5a3dc3 100644 (file)
@@ -2054,17 +2054,17 @@ nfsd4_decode_offload_status(struct nfsd4_compoundargs *argp,
 static __be32
 nfsd4_decode_seek(struct nfsd4_compoundargs *argp, struct nfsd4_seek *seek)
 {
-       DECODE_HEAD;
+       __be32 status;
 
-       status = nfsd4_decode_stateid(argp, &seek->seek_stateid);
+       status = nfsd4_decode_stateid4(argp, &seek->seek_stateid);
        if (status)
                return status;
+       if (xdr_stream_decode_u64(argp->xdr, &seek->seek_offset) < 0)
+               return nfserr_bad_xdr;
+       if (xdr_stream_decode_u32(argp->xdr, &seek->seek_whence) < 0)
+               return nfserr_bad_xdr;
 
-       READ_BUF(8 + 4);
-       p = xdr_decode_hyper(p, &seek->seek_offset);
-       seek->seek_whence = be32_to_cpup(p);
-
-       DECODE_TAIL;
+       return nfs_ok;
 }
 
 /*