From: Brian Foster <bfoster@redhat.com>
To: Dave Chinner <david@fromorbit.com>
Cc: bpm@sgi.com, xfs@oss.sgi.com
Subject: Re: [PATCH 11/11] xfs: increase number of ACL entries for V5 superblocks
Date: Tue, 21 May 2013 10:00:09 -0400 [thread overview]
Message-ID: <519B7DE9.8030604@redhat.com> (raw)
In-Reply-To: <1369123330-9579-12-git-send-email-david@fromorbit.com>
On 05/21/2013 04:02 AM, Dave Chinner wrote:
> From: Dave Chinner <dchinner@redhat.com>
>
> The limit of 25 ACL entries is arbitrary, but baked into the on-disk
> format. For version 5 superblocks, increase it to the maximum nuber
> of ACLs that can fit into a single xattr.
>
> Signed-off-by: Dave Chinner <dchinner@redhat.com>
> ---
> fs/xfs/xfs_acl.c | 31 ++++++++++++++++++-------------
> fs/xfs/xfs_acl.h | 30 +++++++++++++++++++++++-------
> 2 files changed, 41 insertions(+), 20 deletions(-)
>
...
> diff --git a/fs/xfs/xfs_acl.h b/fs/xfs/xfs_acl.h
> index 39632d9..5310a52 100644
> --- a/fs/xfs/xfs_acl.h
> +++ b/fs/xfs/xfs_acl.h
> @@ -22,19 +22,35 @@ struct inode;
> struct posix_acl;
> struct xfs_inode;
>
> -#define XFS_ACL_MAX_ENTRIES 25
> #define XFS_ACL_NOT_PRESENT (-1)
>
> /* On-disk XFS access control list structure */
> +struct xfs_acl_entry {
> + __be32 ae_tag;
> + __be32 ae_id;
> + __be16 ae_perm;
> + __be16 ae_pad; /* fill the implicit hole in the structure */
> +};
> +
> struct xfs_acl {
> - __be32 acl_cnt;
> - struct xfs_acl_entry {
> - __be32 ae_tag;
> - __be32 ae_id;
> - __be16 ae_perm;
> - } acl_entry[XFS_ACL_MAX_ENTRIES];
> + __be32 acl_cnt;
> + struct xfs_acl_entry acl_entry[0];
> };
>
> +/*
> + * The number of ACL entries allowed is defined by the on-disk format.
> + * For v4 superblocks, that is limited to 25 entries. For v5 superblocks, it is
> + * limited only by the maximum size of the xattr that stores the information.
> + */
> +#define XFS_ACL_MAX_ENTRIES(mp) \
> + (xfs_sb_version_hascrc(&mp->m_sb) \
> + ? (XATTR_SIZE_MAX - sizeof(__be32) / sizeof(struct xfs_acl_entry)) \
It looks like this should be:
(XATTR_SIZE_MAX - sizeof(__be32)) / sizeof(struct xfs_acl_entry)
(i.e., misplaced parens)
Brian
> + : 25)
> +
> +#define XFS_ACL_SIZE(mp) \
> + (sizeof(struct xfs_acl) + \
> + sizeof(struct xfs_acl_entry) * XFS_ACL_MAX_ENTRIES((mp)))
> +
> /* On-disk XFS extended attribute names */
> #define SGI_ACL_FILE (unsigned char *)"SGI_ACL_FILE"
> #define SGI_ACL_DEFAULT (unsigned char *)"SGI_ACL_DEFAULT"
>
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
next prev parent reply other threads:[~2013-05-21 14:03 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-21 8:01 [PATCH 00/11] xfs: fixes for 3.10-rc3 Dave Chinner
2013-05-21 8:02 ` [PATCH 01/11] xfs: avoid nesting transactions in xfs_qm_scall_setqlim() Dave Chinner
2013-05-21 18:35 ` Ben Myers
2013-05-21 8:02 ` [PATCH 02/11] xfs: remote attribute allocation may be contiguous Dave Chinner
2013-05-21 8:02 ` [PATCH 03/11] xfs: remote attribute read too short Dave Chinner
2013-05-21 20:59 ` Ben Myers
2013-05-21 22:53 ` Dave Chinner
2013-05-21 8:02 ` [PATCH 04/11] xfs: remote attribute tail zeroing does too much Dave Chinner
2013-05-21 22:31 ` Ben Myers
2013-05-21 22:55 ` Dave Chinner
2013-05-21 8:02 ` [PATCH 05/11] xfs: correctly map remote attr buffers during removal Dave Chinner
2013-05-22 17:01 ` Ben Myers
2013-05-21 8:02 ` [PATCH 06/11] xfs: fully initialise temp leaf in xfs_attr3_leaf_unbalance Dave Chinner
2013-05-22 20:50 ` Ben Myers
2013-05-22 23:54 ` Dave Chinner
2013-05-23 22:51 ` Ben Myers
2013-05-21 8:02 ` [PATCH 07/11] xfs: fully initialise temp leaf in xfs_attr3_leaf_compact Dave Chinner
2013-05-22 21:59 ` Ben Myers
2013-05-22 23:58 ` Dave Chinner
2013-05-23 22:51 ` Ben Myers
2013-05-21 8:02 ` [PATCH 08/11] xfs: don't emit v5 superblock warnings on write Dave Chinner
2013-05-22 22:26 ` Ben Myers
2013-05-23 0:03 ` Dave Chinner
2013-05-23 15:23 ` Ben Myers
2013-05-23 23:13 ` Dave Chinner
2013-05-21 8:02 ` [PATCH 09/11] xfs: rework remote attr CRCs Dave Chinner
2013-05-23 21:54 ` Ben Myers
2013-05-23 23:35 ` Dave Chinner
2013-05-21 8:02 ` [PATCH 10/11] xfs: fix incorrect remote symlink block count Dave Chinner
2013-05-24 20:36 ` Ben Myers
2013-05-24 20:39 ` Ben Myers
2013-05-24 23:41 ` Dave Chinner
2013-05-25 15:16 ` Ben Myers
2013-05-21 8:02 ` [PATCH 11/11] xfs: increase number of ACL entries for V5 superblocks Dave Chinner
2013-05-21 14:00 ` Brian Foster [this message]
2013-05-21 20:27 ` Dave Chinner
2013-05-21 16:26 ` [PATCH 00/11] xfs: fixes for 3.10-rc3 Ben Myers
2013-05-21 20:24 ` Dave Chinner
2013-05-21 20:52 ` Ben Myers
2013-05-21 21:27 ` Dave Chinner
2013-05-23 12:30 ` [PATCH 0/2] xfs: more " Dave Chinner
2013-05-23 12:30 ` [PATCH 1/2] xfs: rework dquot CRCs Dave Chinner
2013-05-23 12:30 ` [PATCH 2/2] xfs: fix split buffer vector log recovery support Dave Chinner
2013-05-24 8:58 ` [patch 0/2] xfs: yet more fixes for 3.10-rc3 Dave Chinner
2013-05-24 8:58 ` [PATCH 1/2] xfs: disable swap extents ioctl on CRC enabled filesystems Dave Chinner
2013-05-24 8:58 ` [PATCH 2/2] xfs: kill suid/sgid through the truncate path Dave Chinner
2013-05-24 10:02 ` Christoph Hellwig
2013-05-24 10:07 ` Christoph Hellwig
2013-05-24 18:29 ` [PATCH 00/11] xfs: fixes for 3.10-rc3 Ben Myers
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=519B7DE9.8030604@redhat.com \
--to=bfoster@redhat.com \
--cc=bpm@sgi.com \
--cc=david@fromorbit.com \
--cc=xfs@oss.sgi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox