projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy...
[powerpc.git]
/
fs
/
lockd
/
mon.c
diff --git
a/fs/lockd/mon.c
b/fs/lockd/mon.c
index
709cf7c
..
eb243ed
100644
(file)
--- a/
fs/lockd/mon.c
+++ b/
fs/lockd/mon.c
@@
-24,7
+24,7
@@
static struct rpc_program nsm_program;
/*
* Local NSM state
*/
/*
* Local NSM state
*/
-
u32
nsm_local_state;
+
int
nsm_local_state;
/*
* Common procedure for SM_MON/SM_UNMON calls
/*
* Common procedure for SM_MON/SM_UNMON calls
@@
-148,8
+148,8
@@
nsm_create(void)
* XDR functions for NSM.
*/
* XDR functions for NSM.
*/
-static
u
32 *
-xdr_encode_common(struct rpc_rqst *rqstp,
u
32 *p, struct nsm_args *argp)
+static
__be
32 *
+xdr_encode_common(struct rpc_rqst *rqstp,
__be
32 *p, struct nsm_args *argp)
{
char buffer[20], *name;
{
char buffer[20], *name;
@@
-176,7
+176,7
@@
xdr_encode_common(struct rpc_rqst *rqstp, u32 *p, struct nsm_args *argp)
}
static int
}
static int
-xdr_encode_mon(struct rpc_rqst *rqstp,
u
32 *p, struct nsm_args *argp)
+xdr_encode_mon(struct rpc_rqst *rqstp,
__be
32 *p, struct nsm_args *argp)
{
p = xdr_encode_common(rqstp, p, argp);
if (IS_ERR(p))
{
p = xdr_encode_common(rqstp, p, argp);
if (IS_ERR(p))
@@
-192,7
+192,7
@@
xdr_encode_mon(struct rpc_rqst *rqstp, u32 *p, struct nsm_args *argp)
}
static int
}
static int
-xdr_encode_unmon(struct rpc_rqst *rqstp,
u
32 *p, struct nsm_args *argp)
+xdr_encode_unmon(struct rpc_rqst *rqstp,
__be
32 *p, struct nsm_args *argp)
{
p = xdr_encode_common(rqstp, p, argp);
if (IS_ERR(p))
{
p = xdr_encode_common(rqstp, p, argp);
if (IS_ERR(p))
@@
-202,7
+202,7
@@
xdr_encode_unmon(struct rpc_rqst *rqstp, u32 *p, struct nsm_args *argp)
}
static int
}
static int
-xdr_decode_stat_res(struct rpc_rqst *rqstp,
u
32 *p, struct nsm_res *resp)
+xdr_decode_stat_res(struct rpc_rqst *rqstp,
__be
32 *p, struct nsm_res *resp)
{
resp->status = ntohl(*p++);
resp->state = ntohl(*p++);
{
resp->status = ntohl(*p++);
resp->state = ntohl(*p++);
@@
-212,7
+212,7
@@
xdr_decode_stat_res(struct rpc_rqst *rqstp, u32 *p, struct nsm_res *resp)
}
static int
}
static int
-xdr_decode_stat(struct rpc_rqst *rqstp,
u
32 *p, struct nsm_res *resp)
+xdr_decode_stat(struct rpc_rqst *rqstp,
__be
32 *p, struct nsm_res *resp)
{
resp->state = ntohl(*p++);
return 0;
{
resp->state = ntohl(*p++);
return 0;