From 9824a03ca13ee6fc8b1b36a2929735720931f463 Mon Sep 17 00:00:00 2001
From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Mon, 14 May 2007 17:21:26 -0400
Subject: [PATCH] --- yaml --- r: 56568 b: refs/heads/master c:
 d48c5f41000ad176df71d2d43932c6c50f938196 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/fs/lockd/xdr.c             | 4 ----
 trunk/fs/lockd/xdr4.c            | 6 ++++--
 trunk/include/linux/lockd/xdr4.h | 1 +
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index a3df294c1a19..b5f1e8d7a7c6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2e42c3e2aec6e24e58c4c601e1a33f0e9e36e314
+refs/heads/master: d48c5f41000ad176df71d2d43932c6c50f938196
diff --git a/trunk/fs/lockd/xdr.c b/trunk/fs/lockd/xdr.c
index 9702956d206c..5316e307a49d 100644
--- a/trunk/fs/lockd/xdr.c
+++ b/trunk/fs/lockd/xdr.c
@@ -586,10 +586,6 @@ static struct rpc_version	nlm_version3 = {
 		.procs		= nlm_procedures,
 };
 
-#ifdef 	CONFIG_LOCKD_V4
-extern struct rpc_version nlm_version4;
-#endif
-
 static struct rpc_version *	nlm_versions[] = {
 	[1] = &nlm_version1,
 	[3] = &nlm_version3,
diff --git a/trunk/fs/lockd/xdr4.c b/trunk/fs/lockd/xdr4.c
index ce1efdbe1b3a..846fc1d639dd 100644
--- a/trunk/fs/lockd/xdr4.c
+++ b/trunk/fs/lockd/xdr4.c
@@ -123,7 +123,8 @@ static __be32 *
 nlm4_decode_lock(__be32 *p, struct nlm_lock *lock)
 {
 	struct file_lock	*fl = &lock->fl;
-	__s64			len, start, end;
+	__u64			len, start;
+	__s64			end;
 
 	if (!(p = xdr_decode_string_inplace(p, &lock->caller,
 					    &lock->len, NLM_MAXSTRLEN))
@@ -417,7 +418,8 @@ nlm4clt_decode_testres(struct rpc_rqst *req, __be32 *p, struct nlm_res *resp)
 	if (resp->status == nlm_lck_denied) {
 		struct file_lock	*fl = &resp->lock.fl;
 		u32			excl;
-		s64			start, end, len;
+		__u64			start, len;
+		__s64			end;
 
 		memset(&resp->lock, 0, sizeof(resp->lock));
 		locks_init_lock(fl);
diff --git a/trunk/include/linux/lockd/xdr4.h b/trunk/include/linux/lockd/xdr4.h
index dd12b4c9e613..12bfe09de2b1 100644
--- a/trunk/include/linux/lockd/xdr4.h
+++ b/trunk/include/linux/lockd/xdr4.h
@@ -42,5 +42,6 @@ int	nlmclt_encode_lockargs(struct rpc_rqst *, u32 *, struct nlm_args *);
 int	nlmclt_encode_cancargs(struct rpc_rqst *, u32 *, struct nlm_args *);
 int	nlmclt_encode_unlockargs(struct rpc_rqst *, u32 *, struct nlm_args *);
  */
+extern struct rpc_version nlm_version4;
 
 #endif /* LOCKD_XDR4_H */