Commit 516c115c authored by Gao Xiang's avatar Gao Xiang Committed by Greg Kroah-Hartman
Browse files

staging: erofs: complete POSIX ACL support 



Let's add .get_acl() to read the file's acl from its xattrs
to make POSIX ACL usable.

Here is the on-disk detail,
fullname: system.posix_acl_access
struct erofs_xattr_entry:
        .e_name_len = 0
        .e_name_index = EROFS_XATTR_INDEX_POSIX_ACL_ACCESS (2)

fullname: system.posix_acl_default
struct erofs_xattr_entry:
	.e_name_len = 0
	.e_name_index = EROFS_XATTR_INDEX_POSIX_ACL_DEFAULT (3)

Reviewed-by: default avatarChao Yu <yuchao0@huawei.com>
Signed-off-by: default avatarGao Xiang <gaoxiang25@huawei.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a24df1f6

drivers/staging/erofs/Documentation/filesystems/erofs.txt

+2 −0
Original line number Diff line number Diff line
@@ -36,6 +36,8 @@ Here is the main features of EROFS: 


 - Support xattr inline and tail-end data inline for all files;



 - Support POSIX.1e ACLs by using xattrs;



 - Support transparent file compression as an option:

   LZ4 algorithm with 4 KB fixed-output compression for high performance;

drivers/staging/erofs/inode.c

+3 −0
Original line number Diff line number Diff line
@@ -287,6 +287,7 @@ const struct inode_operations erofs_generic_iops = { 
#ifdef CONFIG_EROFS_FS_XATTR

	.listxattr = erofs_listxattr,

#endif

	.get_acl = erofs_get_acl,

};



const struct inode_operations erofs_symlink_iops = {
@@ -294,6 +295,7 @@ const struct inode_operations erofs_symlink_iops = { 
#ifdef CONFIG_EROFS_FS_XATTR

	.listxattr = erofs_listxattr,

#endif

	.get_acl = erofs_get_acl,

};



const struct inode_operations erofs_fast_symlink_iops = {
@@ -301,5 +303,6 @@ const struct inode_operations erofs_fast_symlink_iops = { 
#ifdef CONFIG_EROFS_FS_XATTR

	.listxattr = erofs_listxattr,

#endif

	.get_acl = erofs_get_acl,

};

drivers/staging/erofs/namei.c

+1 −0
Original line number Diff line number Diff line
@@ -238,5 +238,6 @@ const struct inode_operations erofs_dir_iops = { 
#ifdef CONFIG_EROFS_FS_XATTR

	.listxattr = erofs_listxattr,

#endif

	.get_acl = erofs_get_acl,

};

drivers/staging/erofs/super.c

+10 −0
Original line number Diff line number Diff line
@@ -398,6 +398,11 @@ static int erofs_read_super(struct super_block *sb, 
	if (!silent)

		infoln("root inode @ nid %llu", ROOT_NID(sbi));



	if (test_opt(sbi, POSIX_ACL))

		sb->s_flags |= SB_POSIXACL;

	else

		sb->s_flags &= ~SB_POSIXACL;



#ifdef CONFIG_EROFS_FS_ZIP

	INIT_RADIX_TREE(&sbi->workstn_tree, GFP_ATOMIC);

#endif
@@ -646,6 +651,11 @@ static int erofs_remount(struct super_block *sb, int *flags, char *data) 
	if (err)

		goto out;



	if (test_opt(sbi, POSIX_ACL))

		sb->s_flags |= SB_POSIXACL;

	else

		sb->s_flags &= ~SB_POSIXACL;



	*flags |= SB_RDONLY;

	return 0;

out:

drivers/staging/erofs/xattr.c

+37 −0
Original line number Diff line number Diff line
@@ -643,3 +643,40 @@ ssize_t erofs_listxattr(struct dentry *dentry, 
	return shared_listxattr(&it);

}



#ifdef CONFIG_EROFS_FS_POSIX_ACL

struct posix_acl *erofs_get_acl(struct inode *inode, int type)

{

	struct posix_acl *acl;

	int prefix, rc;

	char *value = NULL;



	switch (type) {

	case ACL_TYPE_ACCESS:

		prefix = EROFS_XATTR_INDEX_POSIX_ACL_ACCESS;

		break;

	case ACL_TYPE_DEFAULT:

		prefix = EROFS_XATTR_INDEX_POSIX_ACL_DEFAULT;

		break;

	default:

		return ERR_PTR(-EINVAL);

	}



	rc = erofs_getxattr(inode, prefix, "", NULL, 0);

	if (rc > 0) {

		value = kmalloc(rc, GFP_KERNEL);

		if (!value)

			return ERR_PTR(-ENOMEM);

		rc = erofs_getxattr(inode, prefix, "", value, rc);

	}



	if (rc == -ENOATTR)

		acl = NULL;

	else if (rc < 0)

		acl = ERR_PTR(rc);

	else

		acl = posix_acl_from_xattr(&init_user_ns, value, rc);

	kfree(value);

	return acl;

}

#endif