From 93fd2e29a0d493aa2b28cb73654bff7702fb280f Mon Sep 17 00:00:00 2001
From: Chuck Lever <chuck.lever@oracle.com>
Date: Fri, 26 Oct 2007 13:33:01 -0400
Subject: [PATCH] --- yaml --- r: 79615 b: refs/heads/master c:
 5cce428d953cc3843b100e078dbc3c01c6411b85 h: refs/heads/master i:   79613:
 0db199c315ab229a2cd2da65e7c65490579c6618   79611:
 a500fef49bd64dbfd96ae344a14479a33abb3233   79607:
 f6385b8504121e20c0e211ee067e076c158ae60c   79599:
 c5a01fa4bdeeaf8e4065041d1ce010962a2cab77   79583:
 a80dd4ab8101d6c4d2443641bb8c20f0c7a7e50e   79551:
 b62157ceed7a13ba2f3a6794779497e99805ce6c   79487:
 66bfc7669db9a55a0987813d5bcfb5f390a32301   79359:
 e88e1cc40b4ec9ddf696b4e4e91a02b13faaa9d6 v: v3

---
 [refs]                      | 2 +-
 trunk/fs/nfs/callback_xdr.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 175afd6fc104..3cdffc02f703 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d45273ed6f4613e81701c3e896d9db200c288fff
+refs/heads/master: 5cce428d953cc3843b100e078dbc3c01c6411b85
diff --git a/trunk/fs/nfs/callback_xdr.c b/trunk/fs/nfs/callback_xdr.c
index 058ade7efe79..97abd829e432 100644
--- a/trunk/fs/nfs/callback_xdr.c
+++ b/trunk/fs/nfs/callback_xdr.c
@@ -139,7 +139,7 @@ static __be32 decode_compound_hdr_arg(struct xdr_stream *xdr, struct cb_compound
 	if (unlikely(status != 0))
 		return status;
 	/* We do not like overly long tags! */
-	if (hdr->taglen > CB_OP_TAGLEN_MAXSZ-12 || hdr->taglen < 0) {
+	if (hdr->taglen > CB_OP_TAGLEN_MAXSZ - 12) {
 		printk("NFSv4 CALLBACK %s: client sent tag of length %u\n",
 				__FUNCTION__, hdr->taglen);
 		return htonl(NFS4ERR_RESOURCE);