From 33b02ed35e1a396709e69434bc5b6bf8346c1112 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Fri, 13 Apr 2012 13:49:47 -0400
Subject: [PATCH] --- yaml --- r: 299311 b: refs/heads/master c:
 e847469bf77a1d339274074ed068d461f0c872bc h: refs/heads/master i:   299309:
 3225689af66a373413a1779d9891a89a937373ec   299307:
 49d5693229726904a5e730760b42a85f3a79a3d9   299303:
 973015a4eceaab07a15862f55b4d1ee8daf3f756   299295:
 37d89d1dcb75037c14e1828204e8ee0da03e248a v: v3

---
 [refs]                    | 2 +-
 trunk/fs/lockd/clnt4xdr.c | 2 +-
 trunk/fs/lockd/clntxdr.c  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 756437735c2d..b826e891d658 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 72094e43e3af5020510f920321d71f1798fa896d
+refs/heads/master: e847469bf77a1d339274074ed068d461f0c872bc
diff --git a/trunk/fs/lockd/clnt4xdr.c b/trunk/fs/lockd/clnt4xdr.c
index 3ddcbb1c0a43..13ad1539fbf2 100644
--- a/trunk/fs/lockd/clnt4xdr.c
+++ b/trunk/fs/lockd/clnt4xdr.c
@@ -241,7 +241,7 @@ static int decode_nlm4_stat(struct xdr_stream *xdr, __be32 *stat)
 	p = xdr_inline_decode(xdr, 4);
 	if (unlikely(p == NULL))
 		goto out_overflow;
-	if (unlikely(*p > nlm4_failed))
+	if (unlikely(ntohl(*p) > ntohl(nlm4_failed)))
 		goto out_bad_xdr;
 	*stat = *p;
 	return 0;
diff --git a/trunk/fs/lockd/clntxdr.c b/trunk/fs/lockd/clntxdr.c
index 3d35e3e80c1c..d269ada7670e 100644
--- a/trunk/fs/lockd/clntxdr.c
+++ b/trunk/fs/lockd/clntxdr.c
@@ -236,7 +236,7 @@ static int decode_nlm_stat(struct xdr_stream *xdr,
 	p = xdr_inline_decode(xdr, 4);
 	if (unlikely(p == NULL))
 		goto out_overflow;
-	if (unlikely(*p > nlm_lck_denied_grace_period))
+	if (unlikely(ntohl(*p) > ntohl(nlm_lck_denied_grace_period)))
 		goto out_enum;
 	*stat = *p;
 	return 0;