diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-08-17 15:37:55 +0200 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-08-17 15:37:55 +0200 |
| commit | 327b6b08d6ab3bf5488120ba02ed2fe06b09efe6 (patch) | |
| tree | 592b0ebc2f5f18dac0bdc0fd6ba87d2c8b07b232 /fs/nfs_common/nfsacl.c | |
| parent | Merge with /shiny/git/linux-2.6/.git (diff) | |
| parent | [PATCH] iSeries build with newer assemblers and compilers (diff) | |
| download | linux-327b6b08d6ab3bf5488120ba02ed2fe06b09efe6.tar.xz linux-327b6b08d6ab3bf5488120ba02ed2fe06b09efe6.zip | |
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'fs/nfs_common/nfsacl.c')
| -rw-r--r-- | fs/nfs_common/nfsacl.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/nfs_common/nfsacl.c b/fs/nfs_common/nfsacl.c index 18c58c32e326..251e5a1bb1c4 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; |