aboutsummaryrefslogtreecommitdiff
path: root/fs/nfs_common/nfsacl.c
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-08-18 22:14:39 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-08-18 22:14:39 -0400
commita3bc068022b968a3042b48eb9a8e8b0418fb9cdd (patch)
tree6bbc2806756924105802f4584157396fb98d282c /fs/nfs_common/nfsacl.c
parent54cfb5aa0f4859bd38706eabe0118175780a542f (diff)
parent91aa9fb573fcc50bc74d5ee64c7e9b36131f1804 (diff)
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'fs/nfs_common/nfsacl.c')
-rw-r--r--fs/nfs_common/nfsacl.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/nfs_common/nfsacl.c b/fs/nfs_common/nfsacl.c
index 18c58c32e32..251e5a1bb1c 100644
--- a/fs/nfs_common/nfsacl.c
+++ b/fs/nfs_common/nfsacl.c
@@ -239,6 +239,7 @@ nfsacl_decode(struct xdr_buf *buf, unsigned int base, unsigned int *aclcnt,
if (xdr_decode_word(buf, base, &entries) ||
entries > NFS_ACL_MAX_ENTRIES)
return -EINVAL;
+ nfsacl_desc.desc.array_maxlen = entries;
err = xdr_decode_array2(buf, base + 4, &nfsacl_desc.desc);
if (err)
return err;