NFSD: Replace READ* macros in nfsd4_decode_share_access()

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>

diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
index 59d0290..6bfb549 100644 (file)
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -1012,11 +1012,10 @@ nfsd4_decode_openflag4(struct nfsd4_compoundargs *argp, struct nfsd4_open *open)
 
 static __be32 nfsd4_decode_share_access(struct nfsd4_compoundargs *argp, u32 *share_access, u32 *deleg_want, u32 *deleg_when)
 {
-       __be32 *p;
        u32 w;
 
-       READ_BUF(4);
-       w = be32_to_cpup(p++);
+       if (xdr_stream_decode_u32(argp->xdr, &w) < 0)
+               return nfserr_bad_xdr;
        *share_access = w & NFS4_SHARE_ACCESS_MASK;
        *deleg_want = w & NFS4_SHARE_WANT_MASK;
        if (deleg_when)
@@ -1059,7 +1058,6 @@ static __be32 nfsd4_decode_share_access(struct nfsd4_compoundargs *argp, u32 *sh
              NFS4_SHARE_PUSH_DELEG_WHEN_UNCONTENDED):
                return nfs_ok;
        }
-xdr_error:
        return nfserr_bad_xdr;
 }