From 6a4eef65719eb3ab55a8bb58dbb12b62aad57904 Mon Sep 17 00:00:00 2001 From: "J. Bruce Fields" Date: Tue, 30 May 2006 16:28:58 -0400 Subject: [PATCH] --- yaml --- r: 30091 b: refs/heads/master c: c04871e6345e4c6dfda564e302d7fd8c66420fd5 h: refs/heads/master i: 30089: af93d39246c497020ccce9afad0edb313146f584 30087: 47be29ac502f15157539aed25085c6784f8f74f0 v: v3 --- [refs] | 2 +- trunk/fs/nfs/nfs4xdr.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 986f7b056548..151c0610a383 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3873bc50e2271504da45799257f69222774d9550 +refs/heads/master: c04871e6345e4c6dfda564e302d7fd8c66420fd5 diff --git a/trunk/fs/nfs/nfs4xdr.c b/trunk/fs/nfs/nfs4xdr.c index 7c5d70efe720..7e9a840057f2 100644 --- a/trunk/fs/nfs/nfs4xdr.c +++ b/trunk/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;