mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-11 12:28:41 +08:00
[SUNRPC]: trivial endianness annotations
pure s/u32/__be32/ [AV: large part based on Alexey's patches] Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Alexey Dobriyan
David S. Miller
parent
7699431301
commit
d8ed029d60
@ -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 *);
|
||||
|
||||
@ -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)
|
||||
|
||||
@ -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 *);
|
||||
};
|
||||
|
||||
/*
|
||||
|
||||
@ -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);
|
||||
|
||||
@ -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);
|
||||
|
||||
|
||||
@ -79,7 +79,7 @@ struct rpc_rqst {
|
||||
* This is the private part
|
||||
*/
|
||||
struct rpc_task * rq_task; /* RPC task data */
|
||||
__u32 rq_xid; /* request XID */
|
||||
__be32 rq_xid; /* request XID */
|
||||
int rq_cong; /* has incremented xprt->cong */
|
||||
int rq_received; /* receive completed */
|
||||
u32 rq_seqno; /* gss seq no. used on req. */
|
||||
@ -171,9 +171,9 @@ struct rpc_xprt {
|
||||
/*
|
||||
* State of TCP reply receive stuff
|
||||
*/
|
||||
u32 tcp_recm, /* Fragment header */
|
||||
tcp_xid, /* Current XID */
|
||||
tcp_reclen, /* fragment length */
|
||||
__be32 tcp_recm, /* Fragment header */
|
||||
tcp_xid; /* Current XID */
|
||||
u32 tcp_reclen, /* fragment length */
|
||||
tcp_offset; /* fragment offset */
|
||||
unsigned long tcp_copied, /* copied to request */
|
||||
tcp_flags;
|
||||
@ -253,7 +253,7 @@ void xprt_release(struct rpc_task *task);
|
||||
struct rpc_xprt * xprt_get(struct rpc_xprt *xprt);
|
||||
void xprt_put(struct rpc_xprt *xprt);
|
||||
|
||||
static inline u32 *xprt_skip_transport_header(struct rpc_xprt *xprt, u32 *p)
|
||||
static inline __be32 *xprt_skip_transport_header(struct rpc_xprt *xprt, __be32 *p)
|
||||
{
|
||||
return p + xprt->tsh_size;
|
||||
}
|
||||
@ -268,7 +268,7 @@ void xprt_wait_for_buffer_space(struct rpc_task *task);
|
||||
void xprt_write_space(struct rpc_xprt *xprt);
|
||||
void xprt_update_rtt(struct rpc_task *task);
|
||||
void xprt_adjust_cwnd(struct rpc_task *task, int result);
|
||||
struct rpc_rqst * xprt_lookup_rqst(struct rpc_xprt *xprt, u32 xid);
|
||||
struct rpc_rqst * xprt_lookup_rqst(struct rpc_xprt *xprt, __be32 xid);
|
||||
void xprt_complete_rqst(struct rpc_task *task, int copied);
|
||||
void xprt_release_rqst_cong(struct rpc_task *task);
|
||||
void xprt_disconnect(struct rpc_xprt *xprt);
|
||||
|
||||
@ -331,8 +331,8 @@ rpcauth_unbindcred(struct rpc_task *task)
|
||||
task->tk_msg.rpc_cred = NULL;
|
||||
}
|
||||
|
||||
u32 *
|
||||
rpcauth_marshcred(struct rpc_task *task, u32 *p)
|
||||
__be32 *
|
||||
rpcauth_marshcred(struct rpc_task *task, __be32 *p)
|
||||
{
|
||||
struct rpc_cred *cred = task->tk_msg.rpc_cred;
|
||||
|
||||
@ -342,8 +342,8 @@ rpcauth_marshcred(struct rpc_task *task, u32 *p)
|
||||
return cred->cr_ops->crmarshal(task, p);
|
||||
}
|
||||
|
||||
u32 *
|
||||
rpcauth_checkverf(struct rpc_task *task, u32 *p)
|
||||
__be32 *
|
||||
rpcauth_checkverf(struct rpc_task *task, __be32 *p)
|
||||
{
|
||||
struct rpc_cred *cred = task->tk_msg.rpc_cred;
|
||||
|
||||
@ -355,7 +355,7 @@ rpcauth_checkverf(struct rpc_task *task, u32 *p)
|
||||
|
||||
int
|
||||
rpcauth_wrap_req(struct rpc_task *task, kxdrproc_t encode, void *rqstp,
|
||||
u32 *data, void *obj)
|
||||
__be32 *data, void *obj)
|
||||
{
|
||||
struct rpc_cred *cred = task->tk_msg.rpc_cred;
|
||||
|
||||
@ -369,7 +369,7 @@ rpcauth_wrap_req(struct rpc_task *task, kxdrproc_t encode, void *rqstp,
|
||||
|
||||
int
|
||||
rpcauth_unwrap_resp(struct rpc_task *task, kxdrproc_t decode, void *rqstp,
|
||||
u32 *data, void *obj)
|
||||
__be32 *data, void *obj)
|
||||
{
|
||||
struct rpc_cred *cred = task->tk_msg.rpc_cred;
|
||||
|
||||
|
||||
@ -826,14 +826,14 @@ out:
|
||||
* Marshal credentials.
|
||||
* Maybe we should keep a cached credential for performance reasons.
|
||||
*/
|
||||
static u32 *
|
||||
gss_marshal(struct rpc_task *task, u32 *p)
|
||||
static __be32 *
|
||||
gss_marshal(struct rpc_task *task, __be32 *p)
|
||||
{
|
||||
struct rpc_cred *cred = task->tk_msg.rpc_cred;
|
||||
struct gss_cred *gss_cred = container_of(cred, struct gss_cred,
|
||||
gc_base);
|
||||
struct gss_cl_ctx *ctx = gss_cred_get_ctx(cred);
|
||||
u32 *cred_len;
|
||||
__be32 *cred_len;
|
||||
struct rpc_rqst *req = task->tk_rqstp;
|
||||
u32 maj_stat = 0;
|
||||
struct xdr_netobj mic;
|
||||
@ -894,12 +894,12 @@ gss_refresh(struct rpc_task *task)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static u32 *
|
||||
gss_validate(struct rpc_task *task, u32 *p)
|
||||
static __be32 *
|
||||
gss_validate(struct rpc_task *task, __be32 *p)
|
||||
{
|
||||
struct rpc_cred *cred = task->tk_msg.rpc_cred;
|
||||
struct gss_cl_ctx *ctx = gss_cred_get_ctx(cred);
|
||||
u32 seq;
|
||||
__be32 seq;
|
||||
struct kvec iov;
|
||||
struct xdr_buf verf_buf;
|
||||
struct xdr_netobj mic;
|
||||
@ -940,13 +940,14 @@ out_bad:
|
||||
|
||||
static inline int
|
||||
gss_wrap_req_integ(struct rpc_cred *cred, struct gss_cl_ctx *ctx,
|
||||
kxdrproc_t encode, struct rpc_rqst *rqstp, u32 *p, void *obj)
|
||||
kxdrproc_t encode, struct rpc_rqst *rqstp, __be32 *p, void *obj)
|
||||
{
|
||||
struct xdr_buf *snd_buf = &rqstp->rq_snd_buf;
|
||||
struct xdr_buf integ_buf;
|
||||
u32 *integ_len = NULL;
|
||||
__be32 *integ_len = NULL;
|
||||
struct xdr_netobj mic;
|
||||
u32 offset, *q;
|
||||
u32 offset;
|
||||
__be32 *q;
|
||||
struct kvec *iov;
|
||||
u32 maj_stat = 0;
|
||||
int status = -EIO;
|
||||
@ -1032,13 +1033,13 @@ out:
|
||||
|
||||
static inline int
|
||||
gss_wrap_req_priv(struct rpc_cred *cred, struct gss_cl_ctx *ctx,
|
||||
kxdrproc_t encode, struct rpc_rqst *rqstp, u32 *p, void *obj)
|
||||
kxdrproc_t encode, struct rpc_rqst *rqstp, __be32 *p, void *obj)
|
||||
{
|
||||
struct xdr_buf *snd_buf = &rqstp->rq_snd_buf;
|
||||
u32 offset;
|
||||
u32 maj_stat;
|
||||
int status;
|
||||
u32 *opaque_len;
|
||||
__be32 *opaque_len;
|
||||
struct page **inpages;
|
||||
int first;
|
||||
int pad;
|
||||
@ -1095,7 +1096,7 @@ gss_wrap_req_priv(struct rpc_cred *cred, struct gss_cl_ctx *ctx,
|
||||
|
||||
static int
|
||||
gss_wrap_req(struct rpc_task *task,
|
||||
kxdrproc_t encode, void *rqstp, u32 *p, void *obj)
|
||||
kxdrproc_t encode, void *rqstp, __be32 *p, void *obj)
|
||||
{
|
||||
struct rpc_cred *cred = task->tk_msg.rpc_cred;
|
||||
struct gss_cred *gss_cred = container_of(cred, struct gss_cred,
|
||||
@ -1132,7 +1133,7 @@ out:
|
||||
|
||||
static inline int
|
||||
gss_unwrap_resp_integ(struct rpc_cred *cred, struct gss_cl_ctx *ctx,
|
||||
struct rpc_rqst *rqstp, u32 **p)
|
||||
struct rpc_rqst *rqstp, __be32 **p)
|
||||
{
|
||||
struct xdr_buf *rcv_buf = &rqstp->rq_rcv_buf;
|
||||
struct xdr_buf integ_buf;
|
||||
@ -1169,7 +1170,7 @@ gss_unwrap_resp_integ(struct rpc_cred *cred, struct gss_cl_ctx *ctx,
|
||||
|
||||
static inline int
|
||||
gss_unwrap_resp_priv(struct rpc_cred *cred, struct gss_cl_ctx *ctx,
|
||||
struct rpc_rqst *rqstp, u32 **p)
|
||||
struct rpc_rqst *rqstp, __be32 **p)
|
||||
{
|
||||
struct xdr_buf *rcv_buf = &rqstp->rq_rcv_buf;
|
||||
u32 offset;
|
||||
@ -1198,13 +1199,13 @@ gss_unwrap_resp_priv(struct rpc_cred *cred, struct gss_cl_ctx *ctx,
|
||||
|
||||
static int
|
||||
gss_unwrap_resp(struct rpc_task *task,
|
||||
kxdrproc_t decode, void *rqstp, u32 *p, void *obj)
|
||||
kxdrproc_t decode, void *rqstp, __be32 *p, void *obj)
|
||||
{
|
||||
struct rpc_cred *cred = task->tk_msg.rpc_cred;
|
||||
struct gss_cred *gss_cred = container_of(cred, struct gss_cred,
|
||||
gc_base);
|
||||
struct gss_cl_ctx *ctx = gss_cred_get_ctx(cred);
|
||||
u32 *savedp = p;
|
||||
__be32 *savedp = p;
|
||||
struct kvec *head = ((struct rpc_rqst *)rqstp)->rq_rcv_buf.head;
|
||||
int savedlen = head->iov_len;
|
||||
int status = -EIO;
|
||||
|
||||
@ -115,7 +115,7 @@ gss_get_mic_kerberos(struct gss_ctx *gss_ctx, struct xdr_buf *text,
|
||||
krb5_hdr = ptr - 2;
|
||||
msg_start = krb5_hdr + 24;
|
||||
|
||||
*(u16 *)(krb5_hdr + 2) = htons(ctx->signalg);
|
||||
*(__be16 *)(krb5_hdr + 2) = htons(ctx->signalg);
|
||||
memset(krb5_hdr + 4, 0xff, 4);
|
||||
|
||||
if (make_checksum(checksum_type, krb5_hdr, 8, text, 0, &md5cksum))
|
||||
|
||||
@ -177,9 +177,9 @@ gss_wrap_kerberos(struct gss_ctx *ctx, int offset,
|
||||
msg_start = krb5_hdr + 24;
|
||||
/* XXXJBF: */ BUG_ON(buf->head[0].iov_base + offset + headlen != msg_start + blocksize);
|
||||
|
||||
*(u16 *)(krb5_hdr + 2) = htons(kctx->signalg);
|
||||
*(__be16 *)(krb5_hdr + 2) = htons(kctx->signalg);
|
||||
memset(krb5_hdr + 4, 0xff, 4);
|
||||
*(u16 *)(krb5_hdr + 4) = htons(kctx->sealalg);
|
||||
*(__be16 *)(krb5_hdr + 4) = htons(kctx->sealalg);
|
||||
|
||||
make_confounder(msg_start, blocksize);
|
||||
|
||||
|
||||
@ -640,7 +640,7 @@ svc_safe_putnetobj(struct kvec *resv, struct xdr_netobj *o)
|
||||
*/
|
||||
static int
|
||||
gss_verify_header(struct svc_rqst *rqstp, struct rsc *rsci,
|
||||
u32 *rpcstart, struct rpc_gss_wire_cred *gc, u32 *authp)
|
||||
__be32 *rpcstart, struct rpc_gss_wire_cred *gc, __be32 *authp)
|
||||
{
|
||||
struct gss_ctx *ctx_id = rsci->mechctx;
|
||||
struct xdr_buf rpchdr;
|
||||
@ -687,7 +687,7 @@ gss_verify_header(struct svc_rqst *rqstp, struct rsc *rsci,
|
||||
static int
|
||||
gss_write_null_verf(struct svc_rqst *rqstp)
|
||||
{
|
||||
u32 *p;
|
||||
__be32 *p;
|
||||
|
||||
svc_putnl(rqstp->rq_res.head, RPC_AUTH_NULL);
|
||||
p = rqstp->rq_res.head->iov_base + rqstp->rq_res.head->iov_len;
|
||||
@ -701,11 +701,11 @@ gss_write_null_verf(struct svc_rqst *rqstp)
|
||||
static int
|
||||
gss_write_verf(struct svc_rqst *rqstp, struct gss_ctx *ctx_id, u32 seq)
|
||||
{
|
||||
u32 xdr_seq;
|
||||
__be32 xdr_seq;
|
||||
u32 maj_stat;
|
||||
struct xdr_buf verf_data;
|
||||
struct xdr_netobj mic;
|
||||
u32 *p;
|
||||
__be32 *p;
|
||||
struct kvec iov;
|
||||
|
||||
svc_putnl(rqstp->rq_res.head, RPC_AUTH_GSS);
|
||||
@ -782,7 +782,7 @@ EXPORT_SYMBOL(svcauth_gss_register_pseudoflavor);
|
||||
static inline int
|
||||
read_u32_from_xdr_buf(struct xdr_buf *buf, int base, u32 *obj)
|
||||
{
|
||||
u32 raw;
|
||||
__be32 raw;
|
||||
int status;
|
||||
|
||||
status = read_bytes_from_xdr_buf(buf, base, &raw, sizeof(*obj));
|
||||
@ -905,7 +905,7 @@ struct gss_svc_data {
|
||||
struct rpc_gss_wire_cred clcred;
|
||||
/* pointer to the beginning of the procedure-specific results,
|
||||
* which may be encrypted/checksummed in svcauth_gss_release: */
|
||||
u32 *body_start;
|
||||
__be32 *body_start;
|
||||
struct rsc *rsci;
|
||||
};
|
||||
|
||||
@ -946,7 +946,7 @@ gss_write_init_verf(struct svc_rqst *rqstp, struct rsi *rsip)
|
||||
* response here and return SVC_COMPLETE.
|
||||
*/
|
||||
static int
|
||||
svcauth_gss_accept(struct svc_rqst *rqstp, u32 *authp)
|
||||
svcauth_gss_accept(struct svc_rqst *rqstp, __be32 *authp)
|
||||
{
|
||||
struct kvec *argv = &rqstp->rq_arg.head[0];
|
||||
struct kvec *resv = &rqstp->rq_res.head[0];
|
||||
@ -956,8 +956,8 @@ svcauth_gss_accept(struct svc_rqst *rqstp, u32 *authp)
|
||||
struct rpc_gss_wire_cred *gc;
|
||||
struct rsc *rsci = NULL;
|
||||
struct rsi *rsip, rsikey;
|
||||
u32 *rpcstart;
|
||||
u32 *reject_stat = resv->iov_base + resv->iov_len;
|
||||
__be32 *rpcstart;
|
||||
__be32 *reject_stat = resv->iov_base + resv->iov_len;
|
||||
int ret;
|
||||
|
||||
dprintk("RPC: svcauth_gss: argv->iov_len = %zd\n",argv->iov_len);
|
||||
@ -1156,7 +1156,7 @@ svcauth_gss_wrap_resp_integ(struct svc_rqst *rqstp)
|
||||
struct xdr_buf integ_buf;
|
||||
struct xdr_netobj mic;
|
||||
struct kvec *resv;
|
||||
u32 *p;
|
||||
__be32 *p;
|
||||
int integ_offset, integ_len;
|
||||
int stat = -EINVAL;
|
||||
|
||||
@ -1219,7 +1219,7 @@ svcauth_gss_wrap_resp_priv(struct svc_rqst *rqstp)
|
||||
struct rpc_gss_wire_cred *gc = &gsd->clcred;
|
||||
struct xdr_buf *resbuf = &rqstp->rq_res;
|
||||
struct page **inpages = NULL;
|
||||
u32 *p;
|
||||
__be32 *p;
|
||||
int offset, *len;
|
||||
int pad;
|
||||
|
||||
@ -1264,7 +1264,7 @@ svcauth_gss_wrap_resp_priv(struct svc_rqst *rqstp)
|
||||
return -ENOMEM;
|
||||
*len = htonl(resbuf->len - offset);
|
||||
pad = 3 - ((resbuf->len - offset - 1)&3);
|
||||
p = (u32 *)(resbuf->tail[0].iov_base + resbuf->tail[0].iov_len);
|
||||
p = (__be32 *)(resbuf->tail[0].iov_base + resbuf->tail[0].iov_len);
|
||||
memset(p, 0, pad);
|
||||
resbuf->tail[0].iov_len += pad;
|
||||
resbuf->len += pad;
|
||||
|
||||
@ -60,8 +60,8 @@ nul_match(struct auth_cred *acred, struct rpc_cred *cred, int taskflags)
|
||||
/*
|
||||
* Marshal credential.
|
||||
*/
|
||||
static u32 *
|
||||
nul_marshal(struct rpc_task *task, u32 *p)
|
||||
static __be32 *
|
||||
nul_marshal(struct rpc_task *task, __be32 *p)
|
||||
{
|
||||
*p++ = htonl(RPC_AUTH_NULL);
|
||||
*p++ = 0;
|
||||
@ -81,8 +81,8 @@ nul_refresh(struct rpc_task *task)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static u32 *
|
||||
nul_validate(struct rpc_task *task, u32 *p)
|
||||
static __be32 *
|
||||
nul_validate(struct rpc_task *task, __be32 *p)
|
||||
{
|
||||
rpc_authflavor_t flavor;
|
||||
u32 size;
|
||||
|
||||
@ -137,12 +137,12 @@ unx_match(struct auth_cred *acred, struct rpc_cred *rcred, int flags)
|
||||
* Marshal credentials.
|
||||
* Maybe we should keep a cached credential for performance reasons.
|
||||
*/
|
||||
static u32 *
|
||||
unx_marshal(struct rpc_task *task, u32 *p)
|
||||
static __be32 *
|
||||
unx_marshal(struct rpc_task *task, __be32 *p)
|
||||
{
|
||||
struct rpc_clnt *clnt = task->tk_client;
|
||||
struct unx_cred *cred = (struct unx_cred *) task->tk_msg.rpc_cred;
|
||||
u32 *base, *hold;
|
||||
__be32 *base, *hold;
|
||||
int i;
|
||||
|
||||
*p++ = htonl(RPC_AUTH_UNIX);
|
||||
@ -178,8 +178,8 @@ unx_refresh(struct rpc_task *task)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static u32 *
|
||||
unx_validate(struct rpc_task *task, u32 *p)
|
||||
static __be32 *
|
||||
unx_validate(struct rpc_task *task, __be32 *p)
|
||||
{
|
||||
rpc_authflavor_t flavor;
|
||||
u32 size;
|
||||
|
||||
@ -60,8 +60,8 @@ static void call_refreshresult(struct rpc_task *task);
|
||||
static void call_timeout(struct rpc_task *task);
|
||||
static void call_connect(struct rpc_task *task);
|
||||
static void call_connect_status(struct rpc_task *task);
|
||||
static u32 * call_header(struct rpc_task *task);
|
||||
static u32 * call_verify(struct rpc_task *task);
|
||||
static __be32 * call_header(struct rpc_task *task);
|
||||
static __be32 * call_verify(struct rpc_task *task);
|
||||
|
||||
|
||||
static int
|
||||
@ -782,7 +782,7 @@ call_encode(struct rpc_task *task)
|
||||
struct xdr_buf *rcvbuf = &req->rq_rcv_buf;
|
||||
unsigned int bufsiz;
|
||||
kxdrproc_t encode;
|
||||
u32 *p;
|
||||
__be32 *p;
|
||||
|
||||
dprintk("RPC: %4d call_encode (status %d)\n",
|
||||
task->tk_pid, task->tk_status);
|
||||
@ -1100,7 +1100,7 @@ call_decode(struct rpc_task *task)
|
||||
struct rpc_clnt *clnt = task->tk_client;
|
||||
struct rpc_rqst *req = task->tk_rqstp;
|
||||
kxdrproc_t decode = task->tk_msg.rpc_proc->p_decode;
|
||||
u32 *p;
|
||||
__be32 *p;
|
||||
|
||||
dprintk("RPC: %4d call_decode (status %d)\n",
|
||||
task->tk_pid, task->tk_status);
|
||||
@ -1197,12 +1197,12 @@ call_refreshresult(struct rpc_task *task)
|
||||
/*
|
||||
* Call header serialization
|
||||
*/
|
||||
static u32 *
|
||||
static __be32 *
|
||||
call_header(struct rpc_task *task)
|
||||
{
|
||||
struct rpc_clnt *clnt = task->tk_client;
|
||||
struct rpc_rqst *req = task->tk_rqstp;
|
||||
u32 *p = req->rq_svec[0].iov_base;
|
||||
__be32 *p = req->rq_svec[0].iov_base;
|
||||
|
||||
/* FIXME: check buffer size? */
|
||||
|
||||
@ -1221,12 +1221,13 @@ call_header(struct rpc_task *task)
|
||||
/*
|
||||
* Reply header verification
|
||||
*/
|
||||
static u32 *
|
||||
static __be32 *
|
||||
call_verify(struct rpc_task *task)
|
||||
{
|
||||
struct kvec *iov = &task->tk_rqstp->rq_rcv_buf.head[0];
|
||||
int len = task->tk_rqstp->rq_rcv_buf.len >> 2;
|
||||
u32 *p = iov->iov_base, n;
|
||||
__be32 *p = iov->iov_base;
|
||||
u32 n;
|
||||
int error = -EACCES;
|
||||
|
||||
if ((task->tk_rqstp->rq_rcv_buf.len & 3) != 0) {
|
||||
@ -1303,7 +1304,7 @@ call_verify(struct rpc_task *task)
|
||||
printk(KERN_WARNING "call_verify: auth check failed\n");
|
||||
goto out_garbage; /* bad verifier, retry */
|
||||
}
|
||||
len = p - (u32 *)iov->iov_base - 1;
|
||||
len = p - (__be32 *)iov->iov_base - 1;
|
||||
if (len < 0)
|
||||
goto out_overflow;
|
||||
switch ((n = ntohl(*p++))) {
|
||||
@ -1358,12 +1359,12 @@ out_overflow:
|
||||
goto out_garbage;
|
||||
}
|
||||
|
||||
static int rpcproc_encode_null(void *rqstp, u32 *data, void *obj)
|
||||
static int rpcproc_encode_null(void *rqstp, __be32 *data, void *obj)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int rpcproc_decode_null(void *rqstp, u32 *data, void *obj)
|
||||
static int rpcproc_decode_null(void *rqstp, __be32 *data, void *obj)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -300,7 +300,7 @@ static struct rpc_clnt *pmap_create(char *hostname, struct sockaddr_in *srvaddr,
|
||||
/*
|
||||
* XDR encode/decode functions for PMAP
|
||||
*/
|
||||
static int xdr_encode_mapping(struct rpc_rqst *req, u32 *p, struct portmap_args *map)
|
||||
static int xdr_encode_mapping(struct rpc_rqst *req, __be32 *p, struct portmap_args *map)
|
||||
{
|
||||
dprintk("RPC: xdr_encode_mapping(%u, %u, %u, %u)\n",
|
||||
map->pm_prog, map->pm_vers, map->pm_prot, map->pm_port);
|
||||
@ -313,13 +313,13 @@ static int xdr_encode_mapping(struct rpc_rqst *req, u32 *p, struct portmap_args
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int xdr_decode_port(struct rpc_rqst *req, u32 *p, unsigned short *portp)
|
||||
static int xdr_decode_port(struct rpc_rqst *req, __be32 *p, unsigned short *portp)
|
||||
{
|
||||
*portp = (unsigned short) ntohl(*p++);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int xdr_decode_bool(struct rpc_rqst *req, u32 *p, unsigned int *boolp)
|
||||
static int xdr_decode_bool(struct rpc_rqst *req, __be32 *p, unsigned int *boolp)
|
||||
{
|
||||
*boolp = (unsigned int) ntohl(*p++);
|
||||
return 0;
|
||||
|
||||
@ -256,11 +256,11 @@ svc_process(struct svc_serv *serv, struct svc_rqst *rqstp)
|
||||
struct kvec * argv = &rqstp->rq_arg.head[0];
|
||||
struct kvec * resv = &rqstp->rq_res.head[0];
|
||||
kxdrproc_t xdr;
|
||||
u32 *statp;
|
||||
u32 dir, prog, vers, proc,
|
||||
auth_stat, rpc_stat;
|
||||
__be32 *statp;
|
||||
u32 dir, prog, vers, proc;
|
||||
__be32 auth_stat, rpc_stat;
|
||||
int auth_res;
|
||||
u32 *accept_statp;
|
||||
__be32 *accept_statp;
|
||||
|
||||
rpc_stat = rpc_success;
|
||||
|
||||
|
||||
@ -35,7 +35,7 @@ static struct auth_ops *authtab[RPC_AUTH_MAXFLAVOR] = {
|
||||
};
|
||||
|
||||
int
|
||||
svc_authenticate(struct svc_rqst *rqstp, u32 *authp)
|
||||
svc_authenticate(struct svc_rqst *rqstp, __be32 *authp)
|
||||
{
|
||||
rpc_authflavor_t flavor;
|
||||
struct auth_ops *aops;
|
||||
|
||||
@ -145,7 +145,7 @@ static void ip_map_request(struct cache_detail *cd,
|
||||
{
|
||||
char text_addr[20];
|
||||
struct ip_map *im = container_of(h, struct ip_map, h);
|
||||
__u32 addr = im->m_addr.s_addr;
|
||||
__be32 addr = im->m_addr.s_addr;
|
||||
|
||||
snprintf(text_addr, 20, "%u.%u.%u.%u",
|
||||
ntohl(addr) >> 24 & 0xff,
|
||||
@ -410,7 +410,7 @@ svcauth_unix_set_client(struct svc_rqst *rqstp)
|
||||
}
|
||||
|
||||
static int
|
||||
svcauth_null_accept(struct svc_rqst *rqstp, u32 *authp)
|
||||
svcauth_null_accept(struct svc_rqst *rqstp, __be32 *authp)
|
||||
{
|
||||
struct kvec *argv = &rqstp->rq_arg.head[0];
|
||||
struct kvec *resv = &rqstp->rq_res.head[0];
|
||||
@ -472,7 +472,7 @@ struct auth_ops svcauth_null = {
|
||||
|
||||
|
||||
static int
|
||||
svcauth_unix_accept(struct svc_rqst *rqstp, u32 *authp)
|
||||
svcauth_unix_accept(struct svc_rqst *rqstp, __be32 *authp)
|
||||
{
|
||||
struct kvec *argv = &rqstp->rq_arg.head[0];
|
||||
struct kvec *resv = &rqstp->rq_res.head[0];
|
||||
@ -491,7 +491,7 @@ svcauth_unix_accept(struct svc_rqst *rqstp, u32 *authp)
|
||||
slen = XDR_QUADLEN(svc_getnl(argv)); /* machname length */
|
||||
if (slen > 64 || (len -= (slen + 3)*4) < 0)
|
||||
goto badcred;
|
||||
argv->iov_base = (void*)((u32*)argv->iov_base + slen); /* skip machname */
|
||||
argv->iov_base = (void*)((__be32*)argv->iov_base + slen); /* skip machname */
|
||||
argv->iov_len -= slen*4;
|
||||
|
||||
cred->cr_uid = svc_getnl(argv); /* uid */
|
||||
|
||||
@ -1030,7 +1030,7 @@ svc_tcp_sendto(struct svc_rqst *rqstp)
|
||||
{
|
||||
struct xdr_buf *xbufp = &rqstp->rq_res;
|
||||
int sent;
|
||||
u32 reclen;
|
||||
__be32 reclen;
|
||||
|
||||
/* Set up the first element of the reply kvec.
|
||||
* Any other kvecs that may be in use have been taken
|
||||
|
||||
@ -18,8 +18,8 @@
|
||||
/*
|
||||
* XDR functions for basic NFS types
|
||||
*/
|
||||
u32 *
|
||||
xdr_encode_netobj(u32 *p, const struct xdr_netobj *obj)
|
||||
__be32 *
|
||||
xdr_encode_netobj(__be32 *p, const struct xdr_netobj *obj)
|
||||
{
|
||||
unsigned int quadlen = XDR_QUADLEN(obj->len);
|
||||
|
||||
@ -29,8 +29,8 @@ xdr_encode_netobj(u32 *p, const struct xdr_netobj *obj)
|
||||
return p + XDR_QUADLEN(obj->len);
|
||||
}
|
||||
|
||||
u32 *
|
||||
xdr_decode_netobj(u32 *p, struct xdr_netobj *obj)
|
||||
__be32 *
|
||||
xdr_decode_netobj(__be32 *p, struct xdr_netobj *obj)
|
||||
{
|
||||
unsigned int len;
|
||||
|
||||
@ -55,7 +55,7 @@ xdr_decode_netobj(u32 *p, struct xdr_netobj *obj)
|
||||
* Returns the updated current XDR buffer position
|
||||
*
|
||||
*/
|
||||
u32 *xdr_encode_opaque_fixed(u32 *p, const void *ptr, unsigned int nbytes)
|
||||
__be32 *xdr_encode_opaque_fixed(__be32 *p, const void *ptr, unsigned int nbytes)
|
||||
{
|
||||
if (likely(nbytes != 0)) {
|
||||
unsigned int quadlen = XDR_QUADLEN(nbytes);
|
||||
@ -79,21 +79,21 @@ EXPORT_SYMBOL(xdr_encode_opaque_fixed);
|
||||
*
|
||||
* Returns the updated current XDR buffer position
|
||||
*/
|
||||
u32 *xdr_encode_opaque(u32 *p, const void *ptr, unsigned int nbytes)
|
||||
__be32 *xdr_encode_opaque(__be32 *p, const void *ptr, unsigned int nbytes)
|
||||
{
|
||||
*p++ = htonl(nbytes);
|
||||
return xdr_encode_opaque_fixed(p, ptr, nbytes);
|
||||
}
|
||||
EXPORT_SYMBOL(xdr_encode_opaque);
|
||||
|
||||
u32 *
|
||||
xdr_encode_string(u32 *p, const char *string)
|
||||
__be32 *
|
||||
xdr_encode_string(__be32 *p, const char *string)
|
||||
{
|
||||
return xdr_encode_array(p, string, strlen(string));
|
||||
}
|
||||
|
||||
u32 *
|
||||
xdr_decode_string_inplace(u32 *p, char **sp, int *lenp, int maxlen)
|
||||
__be32 *
|
||||
xdr_decode_string_inplace(__be32 *p, char **sp, int *lenp, int maxlen)
|
||||
{
|
||||
unsigned int len;
|
||||
|
||||
@ -432,7 +432,7 @@ xdr_shift_buf(struct xdr_buf *buf, size_t len)
|
||||
* of the buffer length, and takes care of adjusting the kvec
|
||||
* length for us.
|
||||
*/
|
||||
void xdr_init_encode(struct xdr_stream *xdr, struct xdr_buf *buf, uint32_t *p)
|
||||
void xdr_init_encode(struct xdr_stream *xdr, struct xdr_buf *buf, __be32 *p)
|
||||
{
|
||||
struct kvec *iov = buf->head;
|
||||
int scratch_len = buf->buflen - buf->page_len - buf->tail[0].iov_len;
|
||||
@ -440,8 +440,8 @@ void xdr_init_encode(struct xdr_stream *xdr, struct xdr_buf *buf, uint32_t *p)
|
||||
BUG_ON(scratch_len < 0);
|
||||
xdr->buf = buf;
|
||||
xdr->iov = iov;
|
||||
xdr->p = (uint32_t *)((char *)iov->iov_base + iov->iov_len);
|
||||
xdr->end = (uint32_t *)((char *)iov->iov_base + scratch_len);
|
||||
xdr->p = (__be32 *)((char *)iov->iov_base + iov->iov_len);
|
||||
xdr->end = (__be32 *)((char *)iov->iov_base + scratch_len);
|
||||
BUG_ON(iov->iov_len > scratch_len);
|
||||
|
||||
if (p != xdr->p && p != NULL) {
|
||||
@ -465,10 +465,10 @@ EXPORT_SYMBOL(xdr_init_encode);
|
||||
* bytes of data. If so, update the total xdr_buf length, and
|
||||
* adjust the length of the current kvec.
|
||||
*/
|
||||
uint32_t * xdr_reserve_space(struct xdr_stream *xdr, size_t nbytes)
|
||||
__be32 * xdr_reserve_space(struct xdr_stream *xdr, size_t nbytes)
|
||||
{
|
||||
uint32_t *p = xdr->p;
|
||||
uint32_t *q;
|
||||
__be32 *p = xdr->p;
|
||||
__be32 *q;
|
||||
|
||||
/* align nbytes on the next 32-bit boundary */
|
||||
nbytes += 3;
|
||||
@ -524,7 +524,7 @@ EXPORT_SYMBOL(xdr_write_pages);
|
||||
* @buf: pointer to XDR buffer from which to decode data
|
||||
* @p: current pointer inside XDR buffer
|
||||
*/
|
||||
void xdr_init_decode(struct xdr_stream *xdr, struct xdr_buf *buf, uint32_t *p)
|
||||
void xdr_init_decode(struct xdr_stream *xdr, struct xdr_buf *buf, __be32 *p)
|
||||
{
|
||||
struct kvec *iov = buf->head;
|
||||
unsigned int len = iov->iov_len;
|
||||
@ -534,7 +534,7 @@ void xdr_init_decode(struct xdr_stream *xdr, struct xdr_buf *buf, uint32_t *p)
|
||||
xdr->buf = buf;
|
||||
xdr->iov = iov;
|
||||
xdr->p = p;
|
||||
xdr->end = (uint32_t *)((char *)iov->iov_base + len);
|
||||
xdr->end = (__be32 *)((char *)iov->iov_base + len);
|
||||
}
|
||||
EXPORT_SYMBOL(xdr_init_decode);
|
||||
|
||||
@ -548,10 +548,10 @@ EXPORT_SYMBOL(xdr_init_decode);
|
||||
* If so return the current pointer, then update the current
|
||||
* pointer position.
|
||||
*/
|
||||
uint32_t * xdr_inline_decode(struct xdr_stream *xdr, size_t nbytes)
|
||||
__be32 * xdr_inline_decode(struct xdr_stream *xdr, size_t nbytes)
|
||||
{
|
||||
uint32_t *p = xdr->p;
|
||||
uint32_t *q = p + XDR_QUADLEN(nbytes);
|
||||
__be32 *p = xdr->p;
|
||||
__be32 *q = p + XDR_QUADLEN(nbytes);
|
||||
|
||||
if (unlikely(q > xdr->end || q < p))
|
||||
return NULL;
|
||||
@ -599,8 +599,8 @@ void xdr_read_pages(struct xdr_stream *xdr, unsigned int len)
|
||||
* Position current pointer at beginning of tail, and
|
||||
* set remaining message length.
|
||||
*/
|
||||
xdr->p = (uint32_t *)((char *)iov->iov_base + padding);
|
||||
xdr->end = (uint32_t *)((char *)iov->iov_base + end);
|
||||
xdr->p = (__be32 *)((char *)iov->iov_base + padding);
|
||||
xdr->end = (__be32 *)((char *)iov->iov_base + end);
|
||||
}
|
||||
EXPORT_SYMBOL(xdr_read_pages);
|
||||
|
||||
@ -624,8 +624,8 @@ void xdr_enter_page(struct xdr_stream *xdr, unsigned int len)
|
||||
*/
|
||||
if (len > PAGE_CACHE_SIZE - xdr->buf->page_base)
|
||||
len = PAGE_CACHE_SIZE - xdr->buf->page_base;
|
||||
xdr->p = (uint32_t *)(kaddr + xdr->buf->page_base);
|
||||
xdr->end = (uint32_t *)((char *)xdr->p + len);
|
||||
xdr->p = (__be32 *)(kaddr + xdr->buf->page_base);
|
||||
xdr->end = (__be32 *)((char *)xdr->p + len);
|
||||
}
|
||||
EXPORT_SYMBOL(xdr_enter_page);
|
||||
|
||||
@ -743,7 +743,7 @@ out:
|
||||
int
|
||||
xdr_decode_word(struct xdr_buf *buf, int base, u32 *obj)
|
||||
{
|
||||
u32 raw;
|
||||
__be32 raw;
|
||||
int status;
|
||||
|
||||
status = read_bytes_from_xdr_buf(buf, base, &raw, sizeof(*obj));
|
||||
@ -756,7 +756,7 @@ xdr_decode_word(struct xdr_buf *buf, int base, u32 *obj)
|
||||
int
|
||||
xdr_encode_word(struct xdr_buf *buf, int base, u32 obj)
|
||||
{
|
||||
u32 raw = htonl(obj);
|
||||
__be32 raw = htonl(obj);
|
||||
|
||||
return write_bytes_to_xdr_buf(buf, base, &raw, sizeof(obj));
|
||||
}
|
||||
|
||||
@ -594,7 +594,7 @@ static void xprt_connect_status(struct rpc_task *task)
|
||||
* @xid: RPC XID of incoming reply
|
||||
*
|
||||
*/
|
||||
struct rpc_rqst *xprt_lookup_rqst(struct rpc_xprt *xprt, u32 xid)
|
||||
struct rpc_rqst *xprt_lookup_rqst(struct rpc_xprt *xprt, __be32 xid)
|
||||
{
|
||||
struct list_head *pos;
|
||||
|
||||
@ -801,7 +801,7 @@ void xprt_reserve(struct rpc_task *task)
|
||||
spin_unlock(&xprt->reserve_lock);
|
||||
}
|
||||
|
||||
static inline u32 xprt_alloc_xid(struct rpc_xprt *xprt)
|
||||
static inline __be32 xprt_alloc_xid(struct rpc_xprt *xprt)
|
||||
{
|
||||
return xprt->xid++;
|
||||
}
|
||||
|
||||
@ -548,7 +548,8 @@ static void xs_udp_data_ready(struct sock *sk, int len)
|
||||
struct rpc_rqst *rovr;
|
||||
struct sk_buff *skb;
|
||||
int err, repsize, copied;
|
||||
u32 _xid, *xp;
|
||||
u32 _xid;
|
||||
__be32 *xp;
|
||||
|
||||
read_lock(&sk->sk_callback_lock);
|
||||
dprintk("RPC: xs_udp_data_ready...\n");
|
||||
|
||||
Loading…
Reference in New Issue
Block a user