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

Commit d8ed029d authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by David S. Miller
Browse files

[SUNRPC]: trivial endianness annotations 



pure s/u32/__be32/

[AV: large part based on Alexey's patches]

Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 76994313

include/linux/sunrpc/auth.h

+8 −8
Original line number Diff line number Diff line
@@ -109,13 +109,13 @@ struct rpc_credops { 
	void			(*crdestroy)(struct rpc_cred *);



	int			(*crmatch)(struct auth_cred *, struct rpc_cred *, int);

	u32 *			(*crmarshal)(struct rpc_task *, u32 *);

	__be32 *		(*crmarshal)(struct rpc_task *, __be32 *);

	int			(*crrefresh)(struct rpc_task *);

	u32 *			(*crvalidate)(struct rpc_task *, u32 *);

	__be32 *		(*crvalidate)(struct rpc_task *, __be32 *);

	int			(*crwrap_req)(struct rpc_task *, kxdrproc_t,

						void *, u32 *, void *);

						void *, __be32 *, void *);

	int			(*crunwrap_resp)(struct rpc_task *, kxdrproc_t,

						void *, u32 *, void *);

						void *, __be32 *, void *);

};



extern struct rpc_authops	authunix_ops;
@@ -134,10 +134,10 @@ struct rpc_cred * rpcauth_bindcred(struct rpc_task *); 
void			rpcauth_holdcred(struct rpc_task *);

void			put_rpccred(struct rpc_cred *);

void			rpcauth_unbindcred(struct rpc_task *);

u32 *			rpcauth_marshcred(struct rpc_task *, u32 *);

u32 *			rpcauth_checkverf(struct rpc_task *, u32 *);

int			rpcauth_wrap_req(struct rpc_task *task, kxdrproc_t encode, void *rqstp, u32 *data, void *obj);

int			rpcauth_unwrap_resp(struct rpc_task *task, kxdrproc_t decode, void *rqstp, u32 *data, void *obj);

__be32 *		rpcauth_marshcred(struct rpc_task *, __be32 *);

__be32 *		rpcauth_checkverf(struct rpc_task *, __be32 *);

int			rpcauth_wrap_req(struct rpc_task *task, kxdrproc_t encode, void *rqstp, __be32 *data, void *obj);

int			rpcauth_unwrap_resp(struct rpc_task *task, kxdrproc_t decode, void *rqstp, __be32 *data, void *obj);

int			rpcauth_refreshcred(struct rpc_task *);

void			rpcauth_invalcred(struct rpc_task *);

int			rpcauth_uptodatecred(struct rpc_task *);

include/linux/sunrpc/msg_prot.h

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ enum rpc_auth_stat { 
 * 2GB.

 */



typedef u32	rpc_fraghdr;

typedef __be32	rpc_fraghdr;



#define	RPC_LAST_STREAM_FRAGMENT	(1U << 31)

#define	RPC_FRAGMENT_SIZE_MASK		(~RPC_LAST_STREAM_FRAGMENT)

include/linux/sunrpc/svc.h

+7 −7
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ struct svc_rqst { 
	short			rq_arghi;	/* pages available in argument page list */

	short			rq_resused;	/* pages used for result */



	u32			rq_xid;		/* transmission id */

	__be32			rq_xid;		/* transmission id */

	u32			rq_prog;	/* program number */

	u32			rq_vers;	/* program version */

	u32			rq_proc;	/* procedure number */
@@ -156,7 +156,7 @@ struct svc_rqst { 
				rq_secure  : 1;	/* secure port */





	__u32			rq_daddr;	/* dest addr of request - reply from here */

	__be32			rq_daddr;	/* dest addr of request - reply from here */



	void *			rq_argp;	/* decoded arguments */

	void *			rq_resp;	/* xdr'd results */
@@ -186,7 +186,7 @@ struct svc_rqst { 
 * Check buffer bounds after decoding arguments

 */

static inline int

xdr_argsize_check(struct svc_rqst *rqstp, u32 *p)

xdr_argsize_check(struct svc_rqst *rqstp, __be32 *p)

{

	char *cp = (char *)p;

	struct kvec *vec = &rqstp->rq_arg.head[0];
@@ -195,7 +195,7 @@ xdr_argsize_check(struct svc_rqst *rqstp, u32 *p) 
}



static inline int

xdr_ressize_check(struct svc_rqst *rqstp, u32 *p)

xdr_ressize_check(struct svc_rqst *rqstp, __be32 *p)

{

	struct kvec *vec = &rqstp->rq_res.head[0];

	char *cp = (char*)p;
@@ -266,10 +266,10 @@ struct svc_deferred_req { 
	u32			prot;	/* protocol (UDP or TCP) */

	struct sockaddr_in	addr;

	struct svc_sock		*svsk;	/* where reply must go */

	u32			daddr;	/* where reply must come from */

	__be32			daddr;	/* where reply must come from */

	struct cache_deferred_req handle;

	int			argslen;

	u32			args[0];

	__be32			args[0];

};



/*
@@ -301,7 +301,7 @@ struct svc_version { 
	 * A return value of 0 means drop the request. 

	 * vs_dispatch == NULL means use default dispatcher.

	 */

	int			(*vs_dispatch)(struct svc_rqst *, u32 *);

	int			(*vs_dispatch)(struct svc_rqst *, __be32 *);

};



/*

include/linux/sunrpc/svcauth.h

+2 −2
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ struct auth_ops { 
	char *	name;

	struct module *owner;

	int	flavour;

	int	(*accept)(struct svc_rqst *rq, u32 *authp);

	int	(*accept)(struct svc_rqst *rq, __be32 *authp);

	int	(*release)(struct svc_rqst *rq);

	void	(*domain_release)(struct auth_domain *);

	int	(*set_client)(struct svc_rqst *rq);
@@ -112,7 +112,7 @@ struct auth_ops { 
#define	SVC_COMPLETE	9





extern int	svc_authenticate(struct svc_rqst *rqstp, u32 *authp);

extern int	svc_authenticate(struct svc_rqst *rqstp, __be32 *authp);

extern int	svc_authorise(struct svc_rqst *rqstp);

extern int	svc_set_client(struct svc_rqst *rqstp);

extern int	svc_auth_register(rpc_authflavor_t flavor, struct auth_ops *aops);

include/linux/sunrpc/xdr.h

+19 −19
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ struct xdr_netobj { 
 * side) or svc_rqst pointer (server side).

 * Encode functions always assume there's enough room in the buffer.

 */

typedef int	(*kxdrproc_t)(void *rqstp, u32 *data, void *obj);

typedef int	(*kxdrproc_t)(void *rqstp, __be32 *data, void *obj);



/*

 * Basic structure for transmission/reception of a client XDR message.
@@ -88,19 +88,19 @@ struct xdr_buf { 
/*

 * Miscellaneous XDR helper functions

 */

u32 *	xdr_encode_opaque_fixed(u32 *p, const void *ptr, unsigned int len);

u32 *	xdr_encode_opaque(u32 *p, const void *ptr, unsigned int len);

u32 *	xdr_encode_string(u32 *p, const char *s);

u32 *	xdr_decode_string_inplace(u32 *p, char **sp, int *lenp, int maxlen);

u32 *	xdr_encode_netobj(u32 *p, const struct xdr_netobj *);

u32 *	xdr_decode_netobj(u32 *p, struct xdr_netobj *);

__be32 *xdr_encode_opaque_fixed(__be32 *p, const void *ptr, unsigned int len);

__be32 *xdr_encode_opaque(__be32 *p, const void *ptr, unsigned int len);

__be32 *xdr_encode_string(__be32 *p, const char *s);

__be32 *xdr_decode_string_inplace(__be32 *p, char **sp, int *lenp, int maxlen);

__be32 *xdr_encode_netobj(__be32 *p, const struct xdr_netobj *);

__be32 *xdr_decode_netobj(__be32 *p, struct xdr_netobj *);



void	xdr_encode_pages(struct xdr_buf *, struct page **, unsigned int,

			 unsigned int);

void	xdr_inline_pages(struct xdr_buf *, unsigned int,

			 struct page **, unsigned int, unsigned int);



static inline u32 *xdr_encode_array(u32 *p, const void *s, unsigned int len)

static inline __be32 *xdr_encode_array(__be32 *p, const void *s, unsigned int len)

{

	return xdr_encode_opaque(p, s, len);

}
@@ -108,16 +108,16 @@ static inline u32 *xdr_encode_array(u32 *p, const void *s, unsigned int len) 
/*

 * Decode 64bit quantities (NFSv3 support)

 */

static inline u32 *

xdr_encode_hyper(u32 *p, __u64 val)

static inline __be32 *

xdr_encode_hyper(__be32 *p, __u64 val)

{

	*p++ = htonl(val >> 32);

	*p++ = htonl(val & 0xFFFFFFFF);

	return p;

}



static inline u32 *

xdr_decode_hyper(u32 *p, __u64 *valp)

static inline __be32 *

xdr_decode_hyper(__be32 *p, __u64 *valp)

{

	*valp  = ((__u64) ntohl(*p++)) << 32;

	*valp |= ntohl(*p++);
@@ -128,7 +128,7 @@ xdr_decode_hyper(u32 *p, __u64 *valp) 
 * Adjust kvec to reflect end of xdr'ed data (RPC client XDR)

 */

static inline int

xdr_adjust_iovec(struct kvec *iov, u32 *p)

xdr_adjust_iovec(struct kvec *iov, __be32 *p)

{

	return iov->iov_len = ((u8 *) p - (u8 *) iov->iov_base);

}
@@ -180,19 +180,19 @@ extern int xdr_encode_array2(struct xdr_buf *buf, unsigned int base, 
 * Provide some simple tools for XDR buffer overflow-checking etc.

 */

struct xdr_stream {

	uint32_t *p;		/* start of available buffer */

	__be32 *p;		/* start of available buffer */

	struct xdr_buf *buf;	/* XDR buffer to read/write */



	uint32_t *end;		/* end of available buffer space */

	__be32 *end;		/* end of available buffer space */

	struct kvec *iov;	/* pointer to the current kvec */

};



extern void xdr_init_encode(struct xdr_stream *xdr, struct xdr_buf *buf, uint32_t *p);

extern uint32_t *xdr_reserve_space(struct xdr_stream *xdr, size_t nbytes);

extern void xdr_init_encode(struct xdr_stream *xdr, struct xdr_buf *buf, __be32 *p);

extern __be32 *xdr_reserve_space(struct xdr_stream *xdr, size_t nbytes);

extern void xdr_write_pages(struct xdr_stream *xdr, struct page **pages,

		unsigned int base, unsigned int len);

extern void xdr_init_decode(struct xdr_stream *xdr, struct xdr_buf *buf, uint32_t *p);

extern uint32_t *xdr_inline_decode(struct xdr_stream *xdr, size_t nbytes);

extern void xdr_init_decode(struct xdr_stream *xdr, struct xdr_buf *buf, __be32 *p);

extern __be32 *xdr_inline_decode(struct xdr_stream *xdr, size_t nbytes);

extern void xdr_read_pages(struct xdr_stream *xdr, unsigned int len);

extern void xdr_enter_page(struct xdr_stream *xdr, unsigned int len);