Commit d6952123 authored by Al Viro's avatar Al Viro
Browse files

switch posix_acl_equiv_mode() to umode_t * 



... so that &inode->i_mode could be passed to it

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent d3fb6120

fs/9p/acl.c

+1 −1
Original line number Diff line number Diff line
@@ -319,7 +319,7 @@ static int v9fs_xattr_set_acl(struct dentry *dentry, const char *name, 
	case ACL_TYPE_ACCESS:

		name = POSIX_ACL_XATTR_ACCESS;

		if (acl) {

			mode_t mode = inode->i_mode;

			umode_t mode = inode->i_mode;

			retval = posix_acl_equiv_mode(acl, &mode);

			if (retval < 0)

				goto err_out;

fs/btrfs/acl.c

+1 −4
Original line number Diff line number Diff line
@@ -111,7 +111,6 @@ static int btrfs_set_acl(struct btrfs_trans_handle *trans, 
	int ret, size = 0;

	const char *name;

	char *value = NULL;

	mode_t mode;



	if (acl) {

		ret = posix_acl_valid(acl);
@@ -122,13 +121,11 @@ static int btrfs_set_acl(struct btrfs_trans_handle *trans, 


	switch (type) {

	case ACL_TYPE_ACCESS:

		mode = inode->i_mode;

		name = POSIX_ACL_XATTR_ACCESS;

		if (acl) {

			ret = posix_acl_equiv_mode(acl, &mode);

			ret = posix_acl_equiv_mode(acl, &inode->i_mode);

			if (ret < 0)

				return ret;

			inode->i_mode = mode;

		}

		ret = 0;

		break;

fs/ext2/acl.c

+1 −3
Original line number Diff line number Diff line
@@ -194,12 +194,10 @@ ext2_set_acl(struct inode *inode, int type, struct posix_acl *acl) 
		case ACL_TYPE_ACCESS:

			name_index = EXT2_XATTR_INDEX_POSIX_ACL_ACCESS;

			if (acl) {

				mode_t mode = inode->i_mode;

				error = posix_acl_equiv_mode(acl, &mode);

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

				if (error < 0)

					return error;

				else {

					inode->i_mode = mode;

					inode->i_ctime = CURRENT_TIME_SEC;

					mark_inode_dirty(inode);

					if (error == 0)

fs/ext3/acl.c

+1 −3
Original line number Diff line number Diff line
@@ -199,12 +199,10 @@ ext3_set_acl(handle_t *handle, struct inode *inode, int type, 
		case ACL_TYPE_ACCESS:

			name_index = EXT3_XATTR_INDEX_POSIX_ACL_ACCESS;

			if (acl) {

				mode_t mode = inode->i_mode;

				error = posix_acl_equiv_mode(acl, &mode);

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

				if (error < 0)

					return error;

				else {

					inode->i_mode = mode;

					inode->i_ctime = CURRENT_TIME_SEC;

					ext3_mark_inode_dirty(handle, inode);

					if (error == 0)

fs/ext4/acl.c

+1 −3
Original line number Diff line number Diff line
@@ -198,12 +198,10 @@ ext4_set_acl(handle_t *handle, struct inode *inode, int type, 
	case ACL_TYPE_ACCESS:

		name_index = EXT4_XATTR_INDEX_POSIX_ACL_ACCESS;

		if (acl) {

			mode_t mode = inode->i_mode;

			error = posix_acl_equiv_mode(acl, &mode);

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

			if (error < 0)

				return error;

			else {

				inode->i_mode = mode;

				inode->i_ctime = ext4_current_time(inode);

				ext4_mark_inode_dirty(handle, inode);

				if (error == 0)