On 2023/8/14 11:42, Jingbo Xu wrote:
Add erofs_inode_tag_opaque() helper checking if it's an opaque directory.
Signed-off-by: Jingbo Xu <[email protected]>
---
include/erofs/internal.h | 2 ++
include/erofs/xattr.h | 22 ++++++++++++++++++++
lib/tar.c | 5 -----
lib/xattr.c | 44 ++++++++++++++++++++++++++++++++++++++++
4 files changed, 68 insertions(+), 5 deletions(-)
diff --git a/include/erofs/internal.h b/include/erofs/internal.h
index 892dc96..3631cc1 100644
--- a/include/erofs/internal.h
+++ b/include/erofs/internal.h
@@ -219,6 +219,8 @@ struct erofs_inode {
#endif
erofs_off_t fragmentoff;
unsigned int fragment_size;
+
+ bool opaque;
could we move it upwards? for example, just under
bool with_tmpfile;
};
static inline erofs_off_t erofs_iloc(struct erofs_inode *inode)
diff --git a/include/erofs/xattr.h b/include/erofs/xattr.h
index 634daf9..21d669b 100644
--- a/include/erofs/xattr.h
+++ b/include/erofs/xattr.h
@@ -73,6 +73,27 @@ static inline unsigned int xattrblock_offset(struct
erofs_inode *vi,
#ifndef XATTR_NAME_POSIX_ACL_DEFAULT
#define XATTR_NAME_POSIX_ACL_DEFAULT "system.posix_acl_default"
#endif
+#ifndef OVL_XATTR_NAMESPACE
+#define OVL_XATTR_NAMESPACE "overlay."
+#endif
+#ifndef OVL_XATTR_OPAQUE_POSTFIX
+#define OVL_XATTR_OPAQUE_POSTFIX "opaque"
+#endif
+#ifndef OVL_XATTR_TRUSTED_PREFIX
+#define OVL_XATTR_TRUSTED_PREFIX XATTR_TRUSTED_PREFIX OVL_XATTR_NAMESPACE
+#endif
+#ifndef OVL_XATTR_OPAQUE_SUFFIX
+#define OVL_XATTR_OPAQUE_SUFFIX OVL_XATTR_NAMESPACE OVL_XATTR_OPAQUE_POSTFIX
+#endif
+#ifndef OVL_XATTR_OPAQUE_SUFFIX_LEN
+#define OVL_XATTR_OPAQUE_SUFFIX_LEN (sizeof(OVL_XATTR_OPAQUE_SUFFIX) - 1)
+#endif
+#ifndef OVL_XATTR_OPAQUE
+#define OVL_XATTR_OPAQUE OVL_XATTR_TRUSTED_PREFIX OVL_XATTR_OPAQUE_POSTFIX
+#endif
+#ifndef OVL_XATTR_OPAQUE_LEN
+#define OVL_XATTR_OPAQUE_LEN (sizeof(OVL_XATTR_OPAQUE) - 1)
+#endif
I'd like to avoid export these symbols in the headers, how about moving all
related logic into lib/xattr.c?
int erofs_scan_file_xattrs(struct erofs_inode *inode);
int erofs_prepare_xattr_ibody(struct erofs_inode *inode);
@@ -86,6 +107,7 @@ int erofs_xattr_write_name_prefixes(struct erofs_sb_info
*sbi, FILE *f);
int erofs_setxattr(struct erofs_inode *inode, char *key,
const void *value, size_t size);
int erofs_read_xattrs_from_disk(struct erofs_inode *inode);
+void erofs_inode_tag_opaque(struct erofs_inode *inode);
#ifdef __cplusplus
}
diff --git a/lib/tar.c b/lib/tar.c
index 42590d2..d7a58d2 100644
--- a/lib/tar.c
+++ b/lib/tar.c
@@ -19,11 +19,6 @@
#include "erofs/xattr.h"
#include "erofs/blobchunk.h"
-#define OVL_XATTR_NAMESPACE "overlay."
-#define OVL_XATTR_TRUSTED_PREFIX XATTR_TRUSTED_PREFIX OVL_XATTR_NAMESPACE
-#define OVL_XATTR_OPAQUE_POSTFIX "opaque"
-#define OVL_XATTR_OPAQUE OVL_XATTR_TRUSTED_PREFIX OVL_XATTR_OPAQUE_POSTFIX
-
#define EROFS_WHITEOUT_DEV 0
static char erofs_libbuf[16384];
diff --git a/lib/xattr.c b/lib/xattr.c
index 8d8f9f0..e9aff53 100644
--- a/lib/xattr.c
+++ b/lib/xattr.c
@@ -1421,6 +1421,50 @@ int erofs_listxattr(struct erofs_inode *vi, char
*buffer, size_t buffer_size)
return shared_listxattr(vi, &it);
}
+static bool erofs_xattr_is_opaque(struct xattr_item *item)
+{
+ struct ea_type_node *tnode;
+ unsigned int plen;
+ const char *prefix;
+
+ if (item->prefix == EROFS_XATTR_INDEX_TRUSTED &&
+ !strncmp(item->kvbuf, OVL_XATTR_OPAQUE_SUFFIX,
+ OVL_XATTR_OPAQUE_SUFFIX_LEN))
+ return true;
+
+ if (item->prefix & EROFS_XATTR_LONG_PREFIX) {
+ list_for_each_entry(tnode, &ea_name_prefixes, list) {
+ prefix = tnode->type.prefix;
+ plen = tnode->type.prefix_len;
+ if (tnode->index == item->prefix &&
+ plen + item->len[0] == OVL_XATTR_OPAQUE_LEN &&
+ !strncmp(prefix, OVL_XATTR_OPAQUE, plen) &&
+ !strncmp(item->kvbuf, OVL_XATTR_OPAQUE + plen,
+ item->len[0]))
+ return true;
These looks too complicated to me, how about just connect prefix and
suffix strings and do a string comparsion together?
Thanks,
Gao Xiang
