git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
fs
/
lockd
/
mon.c
diff --git
a/fs/lockd/mon.c
b/fs/lockd/mon.c
index
de204b3
..
6fc1beb
100644
(file)
--- a/
fs/lockd/mon.c
+++ b/
fs/lockd/mon.c
@@
-19,7
+19,7
@@
static struct rpc_clnt * nsm_create(void);
static struct rpc_clnt * nsm_create(void);
-
extern
struct rpc_program nsm_program;
+
static
struct rpc_program nsm_program;
/*
* Local NSM state
/*
* Local NSM state
@@
-140,7
+140,6
@@
static u32 *
xdr_encode_common(struct rpc_rqst *rqstp, u32 *p, struct nsm_args *argp)
{
char buffer[20];
xdr_encode_common(struct rpc_rqst *rqstp, u32 *p, struct nsm_args *argp)
{
char buffer[20];
- u32 addr = ntohl(argp->addr);
/*
* Use the dotted-quad IP address of the remote host as
/*
* Use the dotted-quad IP address of the remote host as
@@
-148,8
+147,7
@@
xdr_encode_common(struct rpc_rqst *rqstp, u32 *p, struct nsm_args *argp)
* hostname first for whatever remote hostname it receives,
* so this works alright.
*/
* hostname first for whatever remote hostname it receives,
* so this works alright.
*/
- sprintf(buffer, "%d.%d.%d.%d", (addr>>24) & 0xff, (addr>>16) & 0xff,
- (addr>>8) & 0xff, (addr) & 0xff);
+ sprintf(buffer, "%u.%u.%u.%u", NIPQUAD(argp->addr));
if (!(p = xdr_encode_string(p, buffer))
|| !(p = xdr_encode_string(p, system_utsname.nodename)))
return ERR_PTR(-EIO);
if (!(p = xdr_encode_string(p, buffer))
|| !(p = xdr_encode_string(p, system_utsname.nodename)))
return ERR_PTR(-EIO);
@@
-239,7
+237,7
@@
static struct rpc_version * nsm_version[] = {
static struct rpc_stat nsm_stats;
static struct rpc_stat nsm_stats;
-st
ruct rpc_program
nsm_program = {
+st
atic struct rpc_program
nsm_program = {
.name = "statd",
.number = SM_PROGRAM,
.nrvers = sizeof(nsm_version)/sizeof(nsm_version[0]),
.name = "statd",
.number = SM_PROGRAM,
.nrvers = sizeof(nsm_version)/sizeof(nsm_version[0]),