Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ab6e9aaf authored by Trond Myklebust's avatar Trond Myklebust Committed by Anna Schumaker
Browse files

NFSv4: Replace ad-hoc xdr encode/decode helpers with xdr_stream_* generics 



Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
Reviewed-by: default avatarChuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent 0ae060ca

fs/nfs/callback_xdr.c

+2 −6
Original line number Diff line number Diff line
@@ -582,12 +582,8 @@ static __be32 decode_notify_lock_args(struct svc_rqst *rqstp, struct xdr_stream 


static __be32 encode_string(struct xdr_stream *xdr, unsigned int len, const char *str)

{

	__be32 *p;



	p = xdr_reserve_space(xdr, 4 + len);

	if (unlikely(p == NULL))

		return htonl(NFS4ERR_RESOURCE);

	xdr_encode_opaque(p, str, len);

	if (unlikely(xdr_stream_encode_opaque(xdr, str, len) < 0))

		return cpu_to_be32(NFS4ERR_RESOURCE);

	return 0;

}

fs/nfs/flexfilelayout/flexfilelayout.c

+1 −4
Original line number Diff line number Diff line
@@ -1949,10 +1949,7 @@ static int ff_layout_encode_ioerr(struct xdr_stream *xdr, 
static void

encode_opaque_fixed(struct xdr_stream *xdr, const void *buf, size_t len)

{

	__be32 *p;



	p = xdr_reserve_space(xdr, len);

	xdr_encode_opaque_fixed(p, buf, len);

	WARN_ON_ONCE(xdr_stream_encode_opaque_fixed(xdr, buf, len) < 0);

}



static void

fs/nfs/nfs4xdr.c

+9 −24
Original line number Diff line number Diff line
@@ -924,34 +924,22 @@ static __be32 *reserve_space(struct xdr_stream *xdr, size_t nbytes) 


static void encode_opaque_fixed(struct xdr_stream *xdr, const void *buf, size_t len)

{

	__be32 *p;



	p = xdr_reserve_space(xdr, len);

	xdr_encode_opaque_fixed(p, buf, len);

	WARN_ON_ONCE(xdr_stream_encode_opaque_fixed(xdr, buf, len) < 0);

}



static void encode_string(struct xdr_stream *xdr, unsigned int len, const char *str)

{

	__be32 *p;



	p = reserve_space(xdr, 4 + len);

	xdr_encode_opaque(p, str, len);

	WARN_ON_ONCE(xdr_stream_encode_opaque(xdr, str, len) < 0);

}



static void encode_uint32(struct xdr_stream *xdr, u32 n)

{

	__be32 *p;



	p = reserve_space(xdr, 4);

	*p = cpu_to_be32(n);

	WARN_ON_ONCE(xdr_stream_encode_u32(xdr, n) < 0);

}



static void encode_uint64(struct xdr_stream *xdr, u64 n)

{

	__be32 *p;



	p = reserve_space(xdr, 8);

	xdr_encode_hyper(p, n);

	WARN_ON_ONCE(xdr_stream_encode_u64(xdr, n) < 0);

}



static void encode_nfs4_seqid(struct xdr_stream *xdr,
@@ -4294,16 +4282,13 @@ static int decode_access(struct xdr_stream *xdr, u32 *supported, u32 *access) 


static int decode_opaque_fixed(struct xdr_stream *xdr, void *buf, size_t len)

{

	__be32 *p;



	p = xdr_inline_decode(xdr, len);

	if (likely(p)) {

		memcpy(buf, p, len);

		return 0;

	}

	ssize_t ret = xdr_stream_decode_opaque_fixed(xdr, buf, len);

	if (unlikely(ret < 0)) {

		print_overflow_msg(__func__, xdr);

		return -EIO;

	}

	return 0;

}



static int decode_stateid(struct xdr_stream *xdr, nfs4_stateid *stateid)

{