From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from relay.sgi.com (relay2.corp.sgi.com [137.38.102.29]) by oss.sgi.com (Postfix) with ESMTP id 497A67CBF for ; Wed, 5 Jun 2013 08:38:21 -0500 (CDT) Received: from eagdhcp-232-136.americas.sgi.com (eagdhcp-232-136.americas.sgi.com [128.162.232.136]) by relay2.corp.sgi.com (Postfix) with ESMTP id 2E7EB304032 for ; Wed, 5 Jun 2013 06:38:18 -0700 (PDT) Message-ID: <51AF3F4B.2090300@sgi.com> Date: Wed, 05 Jun 2013 08:38:19 -0500 From: Mark Tinguely MIME-Version: 1.0 Subject: Re: [PATCH 4/4] xfs: increase number of ACL entries for V5 superblocks References: <1370398150-12084-1-git-send-email-david@fromorbit.com> <1370398150-12084-5-git-send-email-david@fromorbit.com> <51AF3C69.2040903@sgi.com> In-Reply-To: <51AF3C69.2040903@sgi.com> List-Id: XFS Filesystem from SGI List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: xfs-bounces@oss.sgi.com Sender: xfs-bounces@oss.sgi.com To: xfs@oss.sgi.com On 06/05/13 08:26, Mark Tinguely wrote: > On 06/04/13 21:09, Dave Chinner wrote: >> From: Dave Chinner >> >> 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 >> Reviewed-by: Brian Foster >> --- > >> /* 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(struct xfs_acl)) / \ >> + sizeof(struct xfs_acl_entry) \ >> + : 25) >> + >> +#define XFS_ACL_MAX_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" > > I thought you would leave the XFS_ACL_MAX_ENTRIES(mp) as: > ... never mind, now I get it "struct xfs_acl_entry acl_entry[0]" reserves no space. Reviewed-by: Mark Tinguely _______________________________________________ xfs mailing list xfs@oss.sgi.com http://oss.sgi.com/mailman/listinfo/xfs