* [PATCH v3 1/2] staging: erofs: use xattr_prefix to wrap up
@ 2019-01-26 3:48 Gao Xiang
2019-01-26 3:48 ` [PATCH v3 2/2] staging: erofs: complete POSIX ACL support Gao Xiang
0 siblings, 1 reply; 3+ messages in thread
From: Gao Xiang @ 2019-01-26 3:48 UTC (permalink / raw)
To: Chao Yu, Greg Kroah-Hartman
Cc: devel, linux-erofs, LKML, chao, weidu.du, Miao Xie, Gao Xiang
From: Gao Xiang <gaoxiang25@huawei.com>
Let's use xattr_prefix instead of open code.
No logic changes.
Reviewed-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Gao Xiang <gaoxiang25@huawei.com>
---
drivers/staging/erofs/xattr.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/staging/erofs/xattr.c b/drivers/staging/erofs/xattr.c
index 1c9498e38f0e..7de46690d972 100644
--- a/drivers/staging/erofs/xattr.c
+++ b/drivers/staging/erofs/xattr.c
@@ -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) {
--
2.11.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH v3 2/2] staging: erofs: complete POSIX ACL support
2019-01-26 3:48 [PATCH v3 1/2] staging: erofs: use xattr_prefix to wrap up Gao Xiang
@ 2019-01-26 3:48 ` Gao Xiang
2019-01-26 6:43 ` Chao Yu
0 siblings, 1 reply; 3+ messages in thread
From: Gao Xiang @ 2019-01-26 3:48 UTC (permalink / raw)
To: Chao Yu, Greg Kroah-Hartman
Cc: devel, linux-erofs, LKML, chao, weidu.du, Miao Xie, Gao Xiang
From: Gao Xiang <gaoxiang25@huawei.com>
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)
Signed-off-by: Gao Xiang <gaoxiang25@huawei.com>
---
change log v3:
- kvmalloc -> erofs_kmalloc suggested by Chao;
- update SB_POSIXACL for the remount case as well;
.../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(+)
diff --git a/drivers/staging/erofs/Documentation/filesystems/erofs.txt b/drivers/staging/erofs/Documentation/filesystems/erofs.txt
index 803988d74c21..961ec4da7705 100644
--- a/drivers/staging/erofs/Documentation/filesystems/erofs.txt
+++ b/drivers/staging/erofs/Documentation/filesystems/erofs.txt
@@ -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;
diff --git a/drivers/staging/erofs/inode.c b/drivers/staging/erofs/inode.c
index 4f04f7c38cf2..924b8dfc7a8f 100644
--- a/drivers/staging/erofs/inode.c
+++ b/drivers/staging/erofs/inode.c
@@ -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,
};
diff --git a/drivers/staging/erofs/namei.c b/drivers/staging/erofs/namei.c
index 7fed1f996ab0..b1752adc5934 100644
--- a/drivers/staging/erofs/namei.c
+++ b/drivers/staging/erofs/namei.c
@@ -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,
};
diff --git a/drivers/staging/erofs/super.c b/drivers/staging/erofs/super.c
index 176fca2af379..15c784fba879 100644
--- a/drivers/staging/erofs/super.c
+++ b/drivers/staging/erofs/super.c
@@ -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:
diff --git a/drivers/staging/erofs/xattr.c b/drivers/staging/erofs/xattr.c
index 7de46690d972..d2241f73a7b9 100644
--- a/drivers/staging/erofs/xattr.c
+++ b/drivers/staging/erofs/xattr.c
@@ -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 = erofs_kmalloc(EROFS_I_SB(inode), 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
+
diff --git a/drivers/staging/erofs/xattr.h b/drivers/staging/erofs/xattr.h
index 634dae9aaa0b..35ba5ac2139a 100644
--- a/drivers/staging/erofs/xattr.h
+++ b/drivers/staging/erofs/xattr.h
@@ -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
--
2.11.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v3 2/2] staging: erofs: complete POSIX ACL support
2019-01-26 3:48 ` [PATCH v3 2/2] staging: erofs: complete POSIX ACL support Gao Xiang
@ 2019-01-26 6:43 ` Chao Yu
0 siblings, 0 replies; 3+ messages in thread
From: Chao Yu @ 2019-01-26 6:43 UTC (permalink / raw)
To: Gao Xiang, Greg Kroah-Hartman
Cc: devel, linux-erofs, LKML, chao, weidu.du, Miao Xie, Gao Xiang
On 2019/1/26 11:48, Gao Xiang wrote:
> From: Gao Xiang <gaoxiang25@huawei.com>
>
> 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)
>
> Signed-off-by: Gao Xiang <gaoxiang25@huawei.com>
> ---
> change log v3:
> - kvmalloc -> erofs_kmalloc suggested by Chao;
> - update SB_POSIXACL for the remount case as well;
Oh, correct, remount case, I missed that one.
It looks good to me now. :)
Reviewed-by: Chao Yu <yuchao0@huawei.com>
Thanks,
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-01-26 6:43 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-01-26 3:48 [PATCH v3 1/2] staging: erofs: use xattr_prefix to wrap up Gao Xiang
2019-01-26 3:48 ` [PATCH v3 2/2] staging: erofs: complete POSIX ACL support Gao Xiang
2019-01-26 6:43 ` Chao Yu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).