Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5beda58b authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Dave Chinner
Browse files

xfs: move acl structures to xfs_format.h 



Move the on-disk ACL format to xfs_format.h, so that repair can
use the common defintion.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
Signed-off-by: default avatarDave Chinner <david@fromorbit.com>
parent 6d3ebaae

fs/xfs/libxfs/xfs_format.h

+36 −0
Original line number Diff line number Diff line
@@ -627,4 +627,40 @@ struct xfs_btree_block { 
#define XFS_BTREE_LBLOCK_CRC_OFF \

	offsetof(struct xfs_btree_block, bb_u.l.bb_crc)



/*

 * 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	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"

#define SGI_ACL_FILE_SIZE	(sizeof(SGI_ACL_FILE)-1)

#define SGI_ACL_DEFAULT_SIZE	(sizeof(SGI_ACL_DEFAULT)-1)



#endif /* __XFS_FORMAT_H__ */

fs/xfs/xfs_acl.h

+0 −36
Original line number Diff line number Diff line
@@ -22,42 +22,6 @@ struct inode; 
struct posix_acl;

struct xfs_inode;



#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	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"

#define SGI_ACL_FILE_SIZE	(sizeof(SGI_ACL_FILE)-1)

#define SGI_ACL_DEFAULT_SIZE	(sizeof(SGI_ACL_DEFAULT)-1)



#ifdef CONFIG_XFS_POSIX_ACL

extern struct posix_acl *xfs_get_acl(struct inode *inode, int type);

extern int xfs_set_acl(struct inode *inode, struct posix_acl *acl, int type);