NFSD: Replace READ* macros in nfsd4_decode_open()

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

diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
index c15d5f8..ece7af1 100644 (file)
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -1124,7 +1124,7 @@ nfsd4_decode_open_claim4(struct nfsd4_compoundargs *argp,
 static __be32
 nfsd4_decode_open(struct nfsd4_compoundargs *argp, struct nfsd4_open *open)
 {
-       DECODE_HEAD;
+       __be32 status;
        u32 dummy;
 
        memset(open->op_bmval, 0, sizeof(open->op_bmval));
@@ -1132,28 +1132,24 @@ nfsd4_decode_open(struct nfsd4_compoundargs *argp, struct nfsd4_open *open)
        open->op_openowner = NULL;
 
        open->op_xdr_error = 0;
-       /* seqid, share_access, share_deny, clientid, ownerlen */
-       READ_BUF(4);
-       open->op_seqid = be32_to_cpup(p++);
-       /* decode, yet ignore deleg_when until supported */
+       if (xdr_stream_decode_u32(argp->xdr, &open->op_seqid) < 0)
+               return nfserr_bad_xdr;
+       /* deleg_want is ignored */
        status = nfsd4_decode_share_access(argp, &open->op_share_access,
                                           &open->op_deleg_want, &dummy);
        if (status)
-               goto xdr_error;
+               return status;
        status = nfsd4_decode_share_deny(argp, &open->op_share_deny);
        if (status)
-               goto xdr_error;
-       READ_BUF(sizeof(clientid_t));
-       COPYMEM(&open->op_clientid, sizeof(clientid_t));
-       status = nfsd4_decode_opaque(argp, &open->op_owner);
+               return status;
+       status = nfsd4_decode_state_owner4(argp, &open->op_clientid,
+                                          &open->op_owner);
        if (status)
-               goto xdr_error;
+               return status;
        status = nfsd4_decode_openflag4(argp, open);
        if (status)
                return status;
-       status = nfsd4_decode_open_claim4(argp, open);
-
-       DECODE_TAIL;
+       return nfsd4_decode_open_claim4(argp, open);
 }
 
 static __be32