From: J. Bruce Fields <bfields@fieldses.org>
Date: Tue, 30 May 2006 20:28:58 +0000 (-0400)
Subject: NFSv4: remove obviously bogus comparison from decode_getacl
X-Git-Tag: v2.6.18-rc1~861^2~42
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=c04871e6345e4c6dfda564e302d7fd8c66420fd5;p=linux-2.6-omap-h63xx.git

NFSv4: remove obviously bogus comparison from decode_getacl

We just set *acl_len to zero, and attrlen is unsigned, so this comparison
is clearly bogus.  I have no idea what I was thinking.

Fixes a bug that caused getacl to fail over krb5p.

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

diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c
index 7c5d70efe72..7e9a840057f 100644
--- a/fs/nfs/nfs4xdr.c
+++ b/fs/nfs/nfs4xdr.c
@@ -3350,8 +3350,7 @@ static int decode_getacl(struct xdr_stream *xdr, struct rpc_rqst *req,
 					attrlen, recvd);
 			return -EINVAL;
 		}
-		if (attrlen <= *acl_len)
-			xdr_read_pages(xdr, attrlen);
+		xdr_read_pages(xdr, attrlen);
 		*acl_len = attrlen;
 	} else
 		status = -EOPNOTSUPP;