Commit b0c1b1ba authored by Chuck Lever's avatar Chuck Lever
Browse files

NFSD: Restructure nfsd4_encode_create_session() 



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

Reviewed-by: default avatarJeff Layton <jlayton@kernel.org>
Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
parent 150990f4

fs/nfsd/nfs4xdr.c

+12 −9
Original line number Diff line number Diff line
@@ -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)

fs/nfsd/xdr4.h

+1 −0
Original line number Diff line number Diff line
@@ -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