Commit 1545e488 authored by Mike Snitzer's avatar Mike Snitzer Committed by Anna Schumaker
Browse files

nfs: factor out {encode,decode}_opaque_fixed to nfs_xdr.h 



Eliminates duplicate functions in various files to allow for
additional callers.

Signed-off-by: default avatarMike Snitzer <snitzer@kernel.org>
Reviewed-by: default avatarNeilBrown <neilb@suse.de>
Reviewed-by: default avatarJeff Layton <jlayton@kernel.org>
Signed-off-by: default avatarAnna Schumaker <anna.schumaker@oracle.com>
parent 1fcb1667

fs/nfs/flexfilelayout/flexfilelayout.c

+0 −6
Original line number Diff line number Diff line
@@ -2086,12 +2086,6 @@ static int ff_layout_encode_ioerr(struct xdr_stream *xdr, 
	return ff_layout_encode_ds_ioerr(xdr, &ff_args->errors);

}



static void

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

{

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

}



static void

ff_layout_encode_ff_iostat_head(struct xdr_stream *xdr,

			    const nfs4_stateid *stateid,

fs/nfs/nfs4xdr.c

+0 −13
Original line number Diff line number Diff line
@@ -972,11 +972,6 @@ static __be32 *reserve_space(struct xdr_stream *xdr, size_t nbytes) 
	return p;

}



static void encode_opaque_fixed(struct xdr_stream *xdr, const void *buf, size_t 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)

{

	WARN_ON_ONCE(xdr_stream_encode_opaque(xdr, str, len) < 0);
@@ -4406,14 +4401,6 @@ static int decode_access(struct xdr_stream *xdr, u32 *supported, u32 *access) 
	return 0;

}



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

{

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

	if (unlikely(ret < 0))

		return -EIO;

	return 0;

}



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

{

	return decode_opaque_fixed(xdr, stateid, NFS4_STATEID_SIZE);

include/linux/nfs_xdr.h

+19 −1
Original line number Diff line number Diff line
@@ -1853,6 +1853,24 @@ struct nfs_rpc_ops { 
	void	(*disable_swap)(struct inode *inode);

};



/*

 * Helper functions used by NFS client and/or server

 */

static inline void encode_opaque_fixed(struct xdr_stream *xdr,

				       const void *buf, size_t len)

{

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

}



static inline int decode_opaque_fixed(struct xdr_stream *xdr,

				      void *buf, size_t len)

{

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

	if (unlikely(ret < 0))

		return -EIO;

	return 0;

}



/*

 * Function vectors etc. for the NFS client

 */
@@ -1866,4 +1884,4 @@ extern const struct rpc_version nfs_version4; 
extern const struct rpc_version nfsacl_version3;

extern const struct rpc_program nfsacl_program;



#endif
 
#endif /* _LINUX_NFS_XDR_H */