NFSD: Restructure nfsd4_encode_create_session()

Convert nfsd4_encode_create_session() to use the conventional XDR
encoding utilities.

Reviewed-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>

diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
index 221881cc638406e132a0e04cd134aced75be5aae..7d452a2a8e85030bd0a99e4cc322b5469463bea9 100644 (file)
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -4826,16 +4826,19 @@ nfsd4_encode_create_session(struct nfsd4_compoundres *resp, __be32 nfserr,
 {
        struct nfsd4_create_session *sess = &u->create_session;
        struct xdr_stream *xdr = resp->xdr;
-       __be32 *p;
-
-       p = xdr_reserve_space(xdr, 24);
-       if (!p)
-               return nfserr_resource;
-       p = xdr_encode_opaque_fixed(p, sess->sessionid.data,
-                                       NFS4_MAX_SESSIONID_LEN);
-       *p++ = cpu_to_be32(sess->seqid);
-       *p++ = cpu_to_be32(sess->flags);
 
+       /* csr_sessionid */
+       nfserr = nfsd4_encode_sessionid4(xdr, &sess->sessionid);
+       if (nfserr != nfs_ok)
+               return nfserr;
+       /* csr_sequence */
+       nfserr = nfsd4_encode_sequenceid4(xdr, sess->seqid);
+       if (nfserr != nfs_ok)
+               return nfserr;
+       /* csr_flags */
+       nfserr = nfsd4_encode_uint32_t(xdr, sess->flags);
+       if (nfserr != nfs_ok)
+               return nfserr;
        /* csr_fore_chan_attrs */
        nfserr = nfsd4_encode_channel_attrs4(xdr, &sess->fore_channel);
        if (nfserr != nfs_ok)

diff --git a/fs/nfsd/xdr4.h b/fs/nfsd/xdr4.h
index cb8e6794a6a169c2a71b7269e3044547496670a2..6716a7904c9fbf364ca3e1b9f75ffdc41c283000 100644 (file)
--- a/fs/nfsd/xdr4.h
+++ b/fs/nfsd/xdr4.h
@@ -96,6 +96,7 @@ nfsd4_encode_uint32_t(struct xdr_stream *xdr, u32 val)
 #define nfsd4_encode_count4(x, v)      nfsd4_encode_uint32_t(x, v)
 #define nfsd4_encode_mode4(x, v)       nfsd4_encode_uint32_t(x, v)
 #define nfsd4_encode_nfs_lease4(x, v)  nfsd4_encode_uint32_t(x, v)
+#define nfsd4_encode_sequenceid4(x, v) nfsd4_encode_uint32_t(x, v)
 
 /**
  * nfsd4_encode_uint64_t - Encode an XDR uint64_t type result