X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=fs%2Flockd%2Fxdr4.c;h=e1d52865319266fa0a96cd09e3d00aeceb7a8561;hb=67e55205ec55cc7899f1d783f217961596798419;hp=43ff9397e6c67fee3504dda5e5c3579c04212cf2;hpb=e159a08b6ab14e255536fddae75d448395295c6f;p=safe%2Fjmp%2Flinux-2.6

diff --git a/fs/lockd/xdr4.c b/fs/lockd/xdr4.c
index 43ff939..e1d5286 100644
--- a/fs/lockd/xdr4.c
+++ b/fs/lockd/xdr4.c
@@ -17,7 +17,6 @@
 #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
 
@@ -356,10 +355,8 @@ nlm4svc_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++);
-	/* Preserve the address in network byte order */
-	argp->addr  = *p++;
-	argp->vers  = *p++;
-	argp->proto = *p++;
+	memcpy(&argp->priv.data, p, sizeof(argp->priv.data));
+	p += XDR_QUADLEN(SM_PRIV_SIZE);
 	return xdr_argsize_check(rqstp, p);
 }