NFSD: Replace READ* macros in nfsd4_decode_seek()

[ Upstream commit 9d32b412fe0a6186cc57789d218e8f8299454ae2 ]

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 101beb315d963f226bf952b6a2f53c48346087bb..2e2fae7e38db2ce4ea25b2c9943d80b41de379d9 100644 (file)
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -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;
 }
 
 /*