NFSD: Replace READ* macros in nfsd4_decode_setclientid_confirm()

[ Upstream commit d1ca55149d67e5896f89a30053f5d83c002ac10e ]

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 0af51cc1adba39ddde8ed9ae2d254ba8f8ea9d30..057cc1579f9b868d5f521bb82a66136ffbb6f693 100644 (file)
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -1355,16 +1355,15 @@ nfsd4_decode_setclientid(struct nfsd4_compoundargs *argp, struct nfsd4_setclient
 static __be32
 nfsd4_decode_setclientid_confirm(struct nfsd4_compoundargs *argp, struct nfsd4_setclientid_confirm *scd_c)
 {
-       DECODE_HEAD;
+       __be32 status;
 
        if (argp->minorversion >= 1)
                return nfserr_notsupp;
 
-       READ_BUF(8 + NFS4_VERIFIER_SIZE);
-       COPYMEM(&scd_c->sc_clientid, 8);
-       COPYMEM(&scd_c->sc_confirm, NFS4_VERIFIER_SIZE);
-
-       DECODE_TAIL;
+       status = nfsd4_decode_clientid4(argp, &scd_c->sc_clientid);
+       if (status)
+               return status;
+       return nfsd4_decode_verifier4(argp, &scd_c->sc_confirm);
 }
 
 /* Also used for NVERIFY */