diff options
| author | Clark Williams <williams@redhat.com> | 2012-01-12 22:11:05 -0600 |
|---|---|---|
| committer | Clark Williams <williams@redhat.com> | 2012-01-12 22:11:05 -0600 |
| commit | 937f5e333d0b05638126f651135d3b8fd6b43665 (patch) | |
| tree | 8c85f620680aca1496b8914288bb38ce11c320fc /fs/xfs/xfs_acl.c | |
| parent | d76fe430665fac3f44ee88958713ecc524fd778d (diff) | |
| parent | b8ed9e5b8c34dc9fb1882669e45b21e3d0194881 (diff) | |
Merge commit 'v3.2.1' into rt-3.2.1-rt9v3.2.1-rt9
Diffstat (limited to 'fs/xfs/xfs_acl.c')
| -rw-r--r-- | fs/xfs/xfs_acl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/xfs_acl.c b/fs/xfs/xfs_acl.c index 76e4266d2e7e..ac702a6eab9b 100644 --- a/fs/xfs/xfs_acl.c +++ b/fs/xfs/xfs_acl.c @@ -39,7 +39,7 @@ xfs_acl_from_disk(struct xfs_acl *aclp) struct posix_acl_entry *acl_e; struct posix_acl *acl; struct xfs_acl_entry *ace; - int count, i; + unsigned int count, i; count = be32_to_cpu(aclp->acl_cnt); if (count > XFS_ACL_MAX_ENTRIES) |