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

Commit 5bf3258f authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Al Viro
Browse files

fs: make posix_acl_chmod more useful 



Rename the current posix_acl_chmod to __posix_acl_chmod and add
a fully featured ACL chmod helper that uses the ->set_acl inode
operation.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 2aeccbe9

fs/9p/acl.c

+1 −1
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ int v9fs_acl_chmod(struct inode *inode, struct p9_fid *fid) 
		return -EOPNOTSUPP;

	acl = v9fs_get_cached_acl(inode, ACL_TYPE_ACCESS);

	if (acl) {

		retval = posix_acl_chmod(&acl, GFP_KERNEL, inode->i_mode);

		retval = __posix_acl_chmod(&acl, GFP_KERNEL, inode->i_mode);

		if (retval)

			return retval;

		set_cached_acl(inode, ACL_TYPE_ACCESS, acl);

fs/btrfs/acl.c

+1 −1
Original line number Diff line number Diff line
@@ -256,7 +256,7 @@ int btrfs_acl_chmod(struct inode *inode) 
	if (IS_ERR_OR_NULL(acl))

		return PTR_ERR(acl);



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

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

	if (ret)

		return ret;

	ret = btrfs_set_acl(NULL, inode, acl, ACL_TYPE_ACCESS);

fs/ext2/acl.c

+1 −1
Original line number Diff line number Diff line
@@ -308,7 +308,7 @@ ext2_acl_chmod(struct inode *inode) 
	acl = ext2_get_acl(inode, ACL_TYPE_ACCESS);

	if (IS_ERR(acl) || !acl)

		return PTR_ERR(acl);

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

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

	if (error)

		return error;

	error = ext2_set_acl(inode, ACL_TYPE_ACCESS, acl);

fs/ext3/acl.c

+1 −1
Original line number Diff line number Diff line
@@ -314,7 +314,7 @@ ext3_acl_chmod(struct inode *inode) 
	acl = ext3_get_acl(inode, ACL_TYPE_ACCESS);

	if (IS_ERR(acl) || !acl)

		return PTR_ERR(acl);

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

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

	if (error)

		return error;

retry:

fs/ext4/acl.c

+1 −1
Original line number Diff line number Diff line
@@ -320,7 +320,7 @@ ext4_acl_chmod(struct inode *inode) 
	acl = ext4_get_acl(inode, ACL_TYPE_ACCESS);

	if (IS_ERR(acl) || !acl)

		return PTR_ERR(acl);

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

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

	if (error)

		return error;

retry: