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

Commit 0c928299 authored by David Chinner's avatar David Chinner Committed by Lachlan McIlroy
Browse files

[XFS] Catch errors from xfs_acl_setmode(). 



Propagate the error status from xfs_acl_setmode() so that callers know if
the ACl was set correctly or not.

SGI-PV: 980084
SGI-Modid: xfs-linux-melb:xfs-kern:30792a

Signed-off-by: default avatarDavid Chinner <dgc@sgi.com>
Signed-off-by: default avatarNiv Sardi <xaiki@sgi.com>
Signed-off-by: default avatarLachlan McIlroy <lachlan@sgi.com>
parent 88ab0208

fs/xfs/xfs_acl.c

+9 −5
Original line number Diff line number Diff line
@@ -307,12 +307,13 @@ xfs_acl_vset( 


	VN_HOLD(vp);

	error = xfs_acl_allow_set(vp, kind);

	if (error)

		goto out;



	/* Incoming ACL exists, set file mode based on its value */

	if (kind == _ACL_TYPE_ACCESS)

		xfs_acl_setmode(vp, xfs_acl, &basicperms);

	if (!error && kind == _ACL_TYPE_ACCESS)

		error = xfs_acl_setmode(vp, xfs_acl, &basicperms);



	if (error)

		goto out;



	/*

	 * If we have more than std unix permissions, set up the actual attr.
@@ -707,7 +708,9 @@ xfs_acl_inherit( 


	memcpy(cacl, pdaclp, sizeof(xfs_acl_t));

	xfs_acl_filter_mode(mode, cacl);

	xfs_acl_setmode(vp, cacl, &basicperms);

	error = xfs_acl_setmode(vp, cacl, &basicperms);

	if (error)

		goto out_error;



	/*

	 * Set the Default and Access ACL on the file.  The mode is already
@@ -720,6 +723,7 @@ xfs_acl_inherit( 
		xfs_acl_set_attr(vp, pdaclp, _ACL_TYPE_DEFAULT, &error);

	if (!error && !basicperms)

		xfs_acl_set_attr(vp, cacl, _ACL_TYPE_ACCESS, &error);

out_error:

	_ACL_FREE(cacl);

	return error;

}