projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.infradead.org/~dwmw2/iommu-2.6.32
[cascardo/linux.git]
/
fs
/
lockd
/
xdr.c
diff --git
a/fs/lockd/xdr.c
b/fs/lockd/xdr.c
index
1f22629
..
b583ab0
100644
(file)
--- a/
fs/lockd/xdr.c
+++ b/
fs/lockd/xdr.c
@@
-8,7
+8,6
@@
#include <linux/types.h>
#include <linux/sched.h>
#include <linux/types.h>
#include <linux/sched.h>
-#include <linux/utsname.h>
#include <linux/nfs.h>
#include <linux/sunrpc/xdr.h>
#include <linux/nfs.h>
#include <linux/sunrpc/xdr.h>
@@
-16,7
+15,6
@@
#include <linux/sunrpc/svc.h>
#include <linux/sunrpc/stats.h>
#include <linux/lockd/lockd.h>
#include <linux/sunrpc/svc.h>
#include <linux/sunrpc/stats.h>
#include <linux/lockd/lockd.h>
-#include <linux/lockd/sm_inter.h>
#define NLMDBG_FACILITY NLMDBG_XDR
#define NLMDBG_FACILITY NLMDBG_XDR
@@
-349,8
+347,8
@@
nlmsvc_decode_reboot(struct svc_rqst *rqstp, __be32 *p, struct nlm_reboot *argp)
if (!(p = xdr_decode_string_inplace(p, &argp->mon, &argp->len, SM_MAXSTRLEN)))
return 0;
argp->state = ntohl(*p++);
if (!(p = xdr_decode_string_inplace(p, &argp->mon, &argp->len, SM_MAXSTRLEN)))
return 0;
argp->state = ntohl(*p++);
- /* Preserve the address in network byte order */
-
argp->addr = *p++
;
+ memcpy(&argp->priv.data, p, sizeof(argp->priv.data));
+
p += XDR_QUADLEN(SM_PRIV_SIZE)
;
return xdr_argsize_check(rqstp, p);
}
return xdr_argsize_check(rqstp, p);
}