summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@fieldses.org>2006-05-30 16:28:58 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2006-06-09 09:34:13 -0400
commitc04871e6345e4c6dfda564e302d7fd8c66420fd5 (patch)
tree4b2a2b0fb5f282ffd5c95f64691476c647acd29f /fs
parent3873bc50e2271504da45799257f69222774d9550 (diff)
downloadblackbird-op-linux-c04871e6345e4c6dfda564e302d7fd8c66420fd5.tar.gz
blackbird-op-linux-c04871e6345e4c6dfda564e302d7fd8c66420fd5.zip
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>
Diffstat (limited to 'fs')
-rw-r--r--fs/nfs/nfs4xdr.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c
index 7c5d70efe720..7e9a840057f2 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;
OpenPOWER on IntegriCloud