staging: erofs: use xattr_prefix to wrap up
PATCH v4 1/2 staging: erofs: use xattr_prefix to wrap up
Let's use xattr_prefix instead of open code.
No logic changes.
---
[resend v2 as v4]
change log v2:
- remove the confusing line according to Dan Carpenter;
drivers/staging/erofs/xattr.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/staging/erofs/xattr.c +1 -2
@@ -520,8 +520,7 @@ static int xattr_entrylist(struct xattr_iter *_it,if (h ==NULL || (h->list !=NULL && !h->list (it->dentry)))return 1 ; -/* Note that at least one of 'prefix' and 'name' should be non-NULL */ - prefix = h->prefix !=NULL ? h->prefix : h->name; + prefix =xattr_prefix (h); prefix_len =strlen (prefix);if (it->buffer ==NULL ) {
Signature · 1 line
2.14.4
PATCH v4 2/2 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)
---
change log v4:
- leave kmalloc and wait the conclusion of fault injection pointed out by Dan Carpenter;
change log v3:
- kvmalloc -> erofs_kmalloc suggested by Chao;
- update SB_POSIXACL for the remount case as well;
change log v2:
- add the missing SB_POSIXACL flag;
- fix the on-disk detail, use .e_name_len == 0 and proper prefix value;
- tested ok with xattr enabled erofs_mkfs;
.../erofs/Documentation/filesystems/erofs.txt | 2 ++ drivers/staging/erofs/inode.c | 3 ++ drivers/staging/erofs/namei.c | 1 + drivers/staging/erofs/super.c | 10 ++++++ drivers/staging/erofs/xattr.c | 37 ++++++++++++++++++++++ drivers/staging/erofs/xattr.h | 6 ++++ 6 files changed, 59 insertions(+)
drivers/staging/erofs/Documentation/filesystems/erofs.txt +2 -0
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 +
drivers/staging/erofs/xattr.h +6 -0
@@ -87,5 +87,11 @@ static ssize_t __maybe_unused erofs_listxattr(struct dentry *dentry, }#endif +#ifdef CONFIG_EROFS_FS_POSIX_ACL +struct posix_acl *erofs_get_acl (struct inode *inode,int type); +#else +#define erofs_get_acl (NULL) +#endif +#endif
Signature · 1 line
2.14.4
Re: [PATCH v4 2/2] staging: erofs: complete POSIX ACL support
Quoted 14 lines · Gao Xiang
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
structerofs_xattr_entry:
.e_name_len = 0
.e_name_index =EROFS_XATTR_INDEX_POSIX_ACL_ACCESS(2)fullname: system.posix_acl_default
structerofs_xattr_entry:.e_name_len = 0 .e_name_index = EROFS_XATTR_INDEX_POSIX_ACL_DEFAULT (3)
Quoted 6 lines
Reviewed-by Chao Yu <yuchao0 at huawei.com>Signed-off-by Gao Xiang <gaoxiang25 at huawei.com>---
change log v4:
- leave kmalloc and wait the conclusion of fault injection pointed out by Dan Carpenter;
I do think this is the right thing, but I also wasn't going to ask you do redo v3. Anyway, thanks!
regards,
dan carpenter
Re: [PATCH v4 2/2] staging: erofs: complete POSIX ACL support
Quoted 22 lines · Dan Carpenter
Quoted 14 lines · Gao Xiang
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
structerofs_xattr_entry:
.e_name_len = 0
.e_name_index =EROFS_XATTR_INDEX_POSIX_ACL_ACCESS(2)fullname: system.posix_acl_default
structerofs_xattr_entry:.e_name_len = 0 .e_name_index = EROFS_XATTR_INDEX_POSIX_ACL_DEFAULT (3)Quoted 6 lines
Reviewed-by Chao Yu <yuchao0 at huawei.com>Signed-off-by Gao Xiang <gaoxiang25 at huawei.com>---
change log v4:
- leave kmalloc and wait the conclusion of fault injection pointed out by Dan Carpenter;
Quoted 5 lines
I do think this is the right thing, but I also wasn't going to ask you do redo v3. Anyway, thanks!
regards,
dan carpenter
OK, let's wait the Chao's idea then...
Thanks,
Gao Xiang