From: J. Bruce Fields <bfields@fieldses.org>
Date: Tue, 3 Jan 2006 08:55:46 +0000 (+0100)
Subject: NLM: fix parsing of sm notify procedure
X-Git-Tag: v2.6.16-rc1~935^2~4^2~14
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=a659753ecc66945e9c69823fcbbe222b446c66d7;p=linux-2.6-omap-h63xx.git

NLM: fix parsing of sm notify procedure

 The procedure that decodes statd sm_notify call seems to be skipping a
 few arguments.  How did this ever work?

 >From folks at Polyserve.

 Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
 Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
---

diff --git a/fs/lockd/xdr4.c b/fs/lockd/xdr4.c
index ae4d6b426c6..fdcf105a530 100644
--- a/fs/lockd/xdr4.c
+++ b/fs/lockd/xdr4.c
@@ -354,7 +354,9 @@ nlm4svc_decode_reboot(struct svc_rqst *rqstp, u32 *p, struct nlm_reboot *argp)
 		return 0;
 	argp->state = ntohl(*p++);
 	/* Preserve the address in network byte order */
-	argp->addr = *p++;
+	argp->addr  = *p++;
+	argp->vers  = *p++;
+	argp->proto = *p++;
 	return xdr_argsize_check(rqstp, p);
 }