NFSD: Replace READ* macros in nfsd4_decode_share_deny()
authorChuck Lever <chuck.lever@oracle.com>
Mon, 16 Nov 2020 22:56:17 +0000 (17:56 -0500)
committerChuck Lever <chuck.lever@oracle.com>
Mon, 30 Nov 2020 19:46:39 +0000 (14:46 -0500)
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
fs/nfsd/nfs4xdr.c

index 6bfb549..fe2c71a 100644 (file)
@@ -1063,16 +1063,13 @@ static __be32 nfsd4_decode_share_access(struct nfsd4_compoundargs *argp, u32 *sh
 
 static __be32 nfsd4_decode_share_deny(struct nfsd4_compoundargs *argp, u32 *x)
 {
-       __be32 *p;
-
-       READ_BUF(4);
-       *x = be32_to_cpup(p++);
-       /* Note: unlinke access bits, deny bits may be zero. */
+       if (xdr_stream_decode_u32(argp->xdr, x) < 0)
+               return nfserr_bad_xdr;
+       /* Note: unlike access bits, deny bits may be zero. */
        if (*x & ~NFS4_SHARE_DENY_BOTH)
                return nfserr_bad_xdr;
+
        return nfs_ok;
-xdr_error:
-       return nfserr_bad_xdr;
 }
 
 static __be32