NFSD: Replace READ* macros in nfsd4_decode_lock()

[ Upstream commit 7c59deed5cd2e1cfc6cbecf06f4584ac53755f53 ]

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 15ed5249e2c742ac3411e630b9f4922515f08bd6..b50d2987bb6e8d12ac9d69ed3f6d69d56e6d262e 100644 (file)
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -878,21 +878,17 @@ nfsd4_decode_locker4(struct nfsd4_compoundargs *argp, struct nfsd4_lock *lock)
 static __be32
 nfsd4_decode_lock(struct nfsd4_compoundargs *argp, struct nfsd4_lock *lock)
 {
-       DECODE_HEAD;
-
-       /*
-       * type, reclaim(boolean), offset, length, new_lock_owner(boolean)
-       */
-       READ_BUF(28);
-       lock->lk_type = be32_to_cpup(p++);
+       if (xdr_stream_decode_u32(argp->xdr, &lock->lk_type) < 0)
+               return nfserr_bad_xdr;
        if ((lock->lk_type < NFS4_READ_LT) || (lock->lk_type > NFS4_WRITEW_LT))
-               goto xdr_error;
-       lock->lk_reclaim = be32_to_cpup(p++);
-       p = xdr_decode_hyper(p, &lock->lk_offset);
-       p = xdr_decode_hyper(p, &lock->lk_length);
-       status = nfsd4_decode_locker4(argp, lock);
-
-       DECODE_TAIL;
+               return nfserr_bad_xdr;
+       if (xdr_stream_decode_bool(argp->xdr, &lock->lk_reclaim) < 0)
+               return nfserr_bad_xdr;
+       if (xdr_stream_decode_u64(argp->xdr, &lock->lk_offset) < 0)
+               return nfserr_bad_xdr;
+       if (xdr_stream_decode_u64(argp->xdr, &lock->lk_length) < 0)
+               return nfserr_bad_xdr;
+       return nfsd4_decode_locker4(argp, lock);
 }
 
 static __be32