NFSD: Replace READ* macros in nfsd4_decode_create_session()

[ Upstream commit 81243e3fe37ed547fc4ed8aab1cec2865540bb18 ]

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 716a16961ff48f855e96387d964546010ef21a2f..3e2e0de00c3a73e69f0a1e87997bb432ed21e0b8 100644 (file)
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -1650,24 +1650,28 @@ static __be32
 nfsd4_decode_create_session(struct nfsd4_compoundargs *argp,
                            struct nfsd4_create_session *sess)
 {
-       DECODE_HEAD;
-
-       READ_BUF(16);
-       COPYMEM(&sess->clientid, 8);
-       sess->seqid = be32_to_cpup(p++);
-       sess->flags = be32_to_cpup(p++);
+       __be32 status;
 
+       status = nfsd4_decode_clientid4(argp, &sess->clientid);
+       if (status)
+               return status;
+       if (xdr_stream_decode_u32(argp->xdr, &sess->seqid) < 0)
+               return nfserr_bad_xdr;
+       if (xdr_stream_decode_u32(argp->xdr, &sess->flags) < 0)
+               return nfserr_bad_xdr;
        status = nfsd4_decode_channel_attrs4(argp, &sess->fore_channel);
        if (status)
                return status;
        status = nfsd4_decode_channel_attrs4(argp, &sess->back_channel);
+       if (status)
+               return status;
+       if (xdr_stream_decode_u32(argp->xdr, &sess->callback_prog) < 0)
+               return nfserr_bad_xdr;
+       status = nfsd4_decode_cb_sec(argp, &sess->cb_sec);
        if (status)
                return status;
 
-       READ_BUF(4);
-       sess->callback_prog = be32_to_cpup(p++);
-       nfsd4_decode_cb_sec(argp, &sess->cb_sec);
-       DECODE_TAIL;
+       return nfs_ok;
 }
 
 static __be32