diff options
| author | Dave Chinner <david@fromorbit.com> | 2015-11-03 13:27:58 +1100 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2015-11-03 13:27:58 +1100 |
| commit | 2da5c4b05ab55225f5d1fcc8c1c37d1918232bf4 (patch) | |
| tree | f19bd87d6e66c251566be226fdf40c24c168e04a /fs/xfs/libxfs | |
| parent | fcd8a399a9d44a637b5ded0eeea14c7933132121 (diff) | |
| parent | fc0561cefc04e7803c0f6501ca4f310a502f65b8 (diff) | |
| download | talos-op-linux-2da5c4b05ab55225f5d1fcc8c1c37d1918232bf4.tar.gz talos-op-linux-2da5c4b05ab55225f5d1fcc8c1c37d1918232bf4.zip | |
Merge branch 'xfs-misc-fixes-for-4.4-2' into for-next
Diffstat (limited to 'fs/xfs/libxfs')
| -rw-r--r-- | fs/xfs/libxfs/xfs_format.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/fs/xfs/libxfs/xfs_format.h b/fs/xfs/libxfs/xfs_format.h index 8568de163004..8774498ce0ff 100644 --- a/fs/xfs/libxfs/xfs_format.h +++ b/fs/xfs/libxfs/xfs_format.h @@ -1495,9 +1495,13 @@ struct xfs_acl { sizeof(struct xfs_acl_entry) \ : 25) -#define XFS_ACL_MAX_SIZE(mp) \ +#define XFS_ACL_SIZE(cnt) \ (sizeof(struct xfs_acl) + \ - sizeof(struct xfs_acl_entry) * XFS_ACL_MAX_ENTRIES((mp))) + sizeof(struct xfs_acl_entry) * cnt) + +#define XFS_ACL_MAX_SIZE(mp) \ + XFS_ACL_SIZE(XFS_ACL_MAX_ENTRIES((mp))) + /* On-disk XFS extended attribute names */ #define SGI_ACL_FILE "SGI_ACL_FILE" |
