From ed02d13f5da896f5563b3673dd16db6c268c0f83 Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Wed, 26 Feb 2020 17:30:44 -0800 Subject: xfs: only allocate the buffer size actually needed in __xfs_set_acl No need to allocate the max size if we can just allocate the easily known actual ACL size. Suggested-by: Dave Chinner Signed-off-by: Christoph Hellwig Reviewed-by: Dave Chinner Reviewed-by: Darrick J. Wong Signed-off-by: Darrick J. Wong --- fs/xfs/xfs_acl.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'fs/xfs/xfs_acl.c') diff --git a/fs/xfs/xfs_acl.c b/fs/xfs/xfs_acl.c index 950ae1e7dae6..d4c687b5cd06 100644 --- a/fs/xfs/xfs_acl.c +++ b/fs/xfs/xfs_acl.c @@ -191,16 +191,11 @@ __xfs_set_acl(struct inode *inode, struct posix_acl *acl, int type) args.namelen = strlen(args.name); if (acl) { - args.valuelen = XFS_ACL_MAX_SIZE(ip->i_mount); + args.valuelen = XFS_ACL_SIZE(acl->a_count); args.value = kmem_zalloc_large(args.valuelen, 0); if (!args.value) return -ENOMEM; - xfs_acl_to_disk(args.value, acl); - - /* subtract away the unused acl entries */ - args.valuelen -= sizeof(struct xfs_acl_entry) * - (XFS_ACL_MAX_ENTRIES(ip->i_mount) - acl->a_count); } error = xfs_attr_set(&args); -- cgit v1.2.3-70-g09d2