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

Commit 85f6456e authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "acl: Reapply previous fix for leaks"

parents 093cd2ab 3c00ef96

fs/gfs2/acl.c

+2 −1
Original line number Diff line number Diff line
@@ -81,7 +81,8 @@ int gfs2_set_acl(struct inode *inode, struct posix_acl *acl, int type) 
		struct posix_acl *old_acl = acl;

		error = posix_acl_update_mode(inode, &inode->i_mode, &acl);



		error = posix_acl_update_mode(inode, &inode->i_mode, &acl);

		if (!acl)

			posix_acl_release(old_acl);

		if (error)

			return error;

		if (mode != inode->i_mode)

fs/xfs/xfs_acl.c

+3 −1
Original line number Diff line number Diff line
@@ -287,8 +287,10 @@ xfs_set_acl(struct inode *inode, struct posix_acl *acl, int type) 


	if (type == ACL_TYPE_ACCESS) {

		umode_t mode;



		struct posix_acl *old_acl = acl;

		error = posix_acl_update_mode(inode, &mode, &acl);

		if (!acl)

			posix_acl_release(old_acl);

		if (error)

			return error;

		error = xfs_set_mode(inode, mode);