Skip to contentSkip to conversation

erofs-utils: mkfs: introduce rebuild mode

PATCH Superseded Jingbo Xu 2 participants 14 messages Aug 22, 2023 – Aug 23, 2023 Library code

v3 of 8 Superseded Latest is v8 →

lore
Share & tools
lore

Jingbo Xu

author
#0 lore raw

v3 cover erofs-utils: mkfs: introduce rebuild mode

v3:
- the original v2 patch [1] is split into patch 1 and 2
- patch 3 is new fix
- patch 6: trusted.overlay.opaque xattr won't be stripped in the mrged view
- patch 8: whiteout is droped only when the object (file or directory) this whiteout tends to hide indeed appears in a merged view; this is implemented with the help of a newly introduced inode->drop flag

[1] https://lore.kernel.org/all/[email protected]/
[2] https://lore.kernel.org/all/[email protected]/

v1: https://lore.kernel.org/all/[email protected]/
v2: https://lore.kernel.org/all/[email protected]/

-------------------------

Introduce a new rebuild mode merging multiple erofs images generated from either tarerfs index mode (--tar=i):

	mkfs.erofs --tar=i --aufs layer0.erofs layer0.tar
	...
	mkfs.erofs --tar=i --aufs layerN.erofs layerN.tar

	mkfs.erofs merge.erofs layerN.erofs ... layer0.erofs

or tarerofs non-index mode (--tar=f):

	mkfs.erofs --tar=f -Enoinline_data --aufs layer0.erofs layer0.tar
	...
	mkfs.erofs --tar=f -Enoinline_data --aufs layerN.erofs layerN.tar

	mkfs.erofs merge.erofs layerN.erofs ... layer0.erofs

Jingbo Xu (11):
erofs-utils: lib: fix erofs_init_devices
erofs-utils: lib: scan devtable if extra_devices is not specified
erofs-utils: lib: fix dirent type of whiteout in tarerofs
erofs-utils: lib: add list_splice_tail() helper
erofs-utils: lib: make erofs_get_unhashed_chunk() global
erofs-utils: lib: add erofs_read_xattrs_from_disk() helper
erofs-utils: lib: add erofs_insert_ihash() helper
erofs-utils: lib: add erofs_rebuild_dump_tree() helper
erofs-utils: lib: add erofs_rebuild_get_dentry() helper
erofs-utils: lib: add erofs_rebuild_load_tree() helper
erofs-utils: mkfs: introduce rebuild mode

 include/erofs/blobchunk.h |   2 +
 include/erofs/inode.h     |   5 +-
 include/erofs/internal.h  |   7 +
 include/erofs/list.h      |  20 ++
 include/erofs/rebuild.h   |  21 ++
 include/erofs/xattr.h     |  33 +---
 lib/Makefile.am           |   3 +-
 lib/blobchunk.c           |   2 +-
 lib/inode.c               |  25 ++-
 lib/rebuild.c             | 395 ++++++++++++++++++++++++++++++++++++++
 lib/super.c               |   9 +-
 lib/tar.c                 | 119 +-----------
 lib/xattr.c               | 112 +++++++++++
 mkfs/main.c               | 199 +++++++++++++++----
 14 files changed, 752 insertions(+), 200 deletions(-)
 create mode 100644 include/erofs/rebuild.h
 create mode 100644 lib/rebuild.c
Signature · 1 line
2.19.1.6.gb485710b
author
#1 lore raw

PATCH v3 1/11 erofs-utils: lib: fix erofs_init_devices

Fix the missing le32_to_cpu() when parsing the device slot. Read and cache the number of blocks of each device for later use.

Fixes 0ce853a01123 ("erofs-utils: fuse: add multiple device support")

[1] https://github.com/erofs/erofsnightly/actions/runs/5921003885/job/16053013007

---
 lib/super.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
lib/super.c +3 -2
index 21dc51f..4fe81c3 100644
@@ -60,8 +60,9 @@ static int erofs_init_devices(struct erofs_sb_info *sbi,
 			return ret;
 		}
 
-		sbi->devs[i].mapped_blkaddr = dis.mapped_blkaddr;
-		sbi->total_blocks += dis.blocks;
+		sbi->devs[i].mapped_blkaddr = le32_to_cpu(dis.mapped_blkaddr);
+		sbi->devs[i].blocks = le32_to_cpu(dis.blocks);
+		sbi->total_blocks += sbi->devs[i].blocks;
 		pos += EROFS_DEVT_SLOT_SIZE;
 	}
 	return 0;
Signature · 1 line
2.19.1.6.gb485710b
author
#3 lore raw

PATCH v3 2/11 erofs-utils: lib: scan devtable if extra_devices is not specified

In reply to Jingbo Xu

Scan the devtable (if any) automatically when reading superblock from disk if sbi->extra_devices is not specified, and initialize sbi->extra_devices with the number of on-disk device slots.

---
 lib/super.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
lib/super.c +3 -1
index 4fe81c3..fc709fc 100644
@@ -37,7 +37,8 @@ static int erofs_init_devices(struct erofs_sb_info *sbi,
 	else
 		ondisk_extradevs = le16_to_cpu(dsb->extra_devices);
 
-	if (ondisk_extradevs != sbi->extra_devices) {
+	if (sbi->extra_devices &&
+	    ondisk_extradevs != sbi->extra_devices) {
 		erofs_err("extra devices don't match (ondisk %u, given %u)",
 			  ondisk_extradevs, sbi->extra_devices);
 		return -EINVAL;
@@ -45,6 +46,7 @@ static int erofs_init_devices(struct erofs_sb_info *sbi,
 	if (!ondisk_extradevs)
 		return 0;
 
+	sbi->extra_devices = ondisk_extradevs;
 	sbi->device_id_mask = roundup_pow_of_two(ondisk_extradevs + 1) - 1;
 	sbi->devs = calloc(ondisk_extradevs, sizeof(*sbi->devs));
 	if (!sbi->devs)
Signature · 1 line
2.19.1.6.gb485710b
#4 lore raw

Re: [PATCH v3 02/11] erofs-utils: lib: scan devtable if extra_devices is not specified

Quoted 14 lines · Jingbo Xu

Scan the devtable (if any) automatically when reading superblock from disk if sbi->extra_devices is not specified, and initialize sbi->extra_devices with the number of on-disk device slots.

---
  lib/super.c | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
lib/super.c +0 -0
index 4fe81c3..fc709fc 100644

lib/super.c static int erofs_init_devices(struct erofs_sb_info *sbi, · line 41

Quoted 6 lines
lib/super.c +2 -1
@@ -37,7 +37,8 @@ static int erofs_init_devices(struct erofs_sb_info *sbi,
  	else
  		ondisk_extradevs = le16_to_cpu(dsb->extra_devices);
 
-	if (ondisk_extradevs != sbi->extra_devices) {
+	if (sbi->extra_devices &&
+	    ondisk_extradevs != sbi->extra_devices) {

If you'd like to keep in sync with the kernel erofs_scan_devices(), please point it out explicitly in the commit message.

Thanks,
Gao Xiang

Quoted 11 lines
lib/super.c +1 -0
  		erofs_err("extra devices don't match (ondisk %u, given %u)",
  			  ondisk_extradevs, sbi->extra_devices);
  		return -EINVAL;
@@ -45,6 +46,7 @@ static int erofs_init_devices(struct erofs_sb_info *sbi,
  	if (!ondisk_extradevs)
  		return 0;
 
+	sbi->extra_devices = ondisk_extradevs;
  	sbi->device_id_mask = roundup_pow_of_two(ondisk_extradevs + 1) - 1;
  	sbi->devs = calloc(ondisk_extradevs, sizeof(*sbi->devs));
  	if (!sbi->devs)
author
#5 lore raw

PATCH v3 3/11 erofs-utils: lib: fix dirent type of whiteout in tarerofs

In reply to Jingbo Xu

Set the correct dirent type for whiteout.

Fixes 95d315fd7958 ("erofs-utils: introduce tarerofs")
---
 lib/tar.c | 1 +
 1 file changed, 1 insertion(+)
lib/tar.c +1 -0
index 42590d2..328ab98 100644
@@ -694,6 +694,7 @@ new_inode:
 	if (whout) {
 		inode->i_mode = (inode->i_mode & ~S_IFMT) | S_IFCHR;
 		inode->u.i_rdev = EROFS_WHITEOUT_DEV;
+		d->type = EROFS_FT_CHRDEV;
 	} else {
 		inode->i_mode = st.st_mode;
 		if (S_ISBLK(st.st_mode) || S_ISCHR(st.st_mode))
Signature · 1 line
2.19.1.6.gb485710b
author
#6 lore raw

PATCH v3 4/11 erofs-utils: lib: add list_splice_tail() helper

In reply to Jingbo Xu

Add list_splice_tail() helper.

---
 include/erofs/list.h | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
include/erofs/list.h +20 -0
index 3f5da1a..d7a9fee 100644
@@ -70,6 +70,26 @@ static inline int list_empty(struct list_head *head)
 	return head->next == head;
 }
 
+static inline void __list_splice(struct list_head *list,
+		struct list_head *prev, struct list_head *next)
+{
+	struct list_head *first = list->next;
+	struct list_head *last = list->prev;
+
+	first->prev = prev;
+	prev->next = first;
+
+	last->next = next;
+	next->prev = last;
+}
+
+static inline void list_splice_tail(struct list_head *list,
+				    struct list_head *head)
+{
+	if (!list_empty(list))
+		__list_splice(list, head->prev, head);
+}
+
 #define list_entry(ptr, type, member) container_of(ptr, type, member)
 
 #define list_first_entry(ptr, type, member)                                    \
Signature · 1 line
2.19.1.6.gb485710b
author
#7 lore raw

PATCH v3 5/11 erofs-utils: lib: make erofs_get_unhashed_chunk() global

In reply to Jingbo Xu

... so that it could be called from outside blobchunk.c later.

---
 include/erofs/blobchunk.h | 2 ++
 lib/blobchunk.c           | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)
include/erofs/blobchunk.h +2 -0
index 010aee1..fb85d8e 100644
@@ -14,6 +14,8 @@ extern "C"
 
 #include "erofs/internal.h"
 
+struct erofs_blobchunk *erofs_get_unhashed_chunk(unsigned int device_id,
+		erofs_blk_t blkaddr, erofs_off_t sourceoffset);
 int erofs_blob_write_chunk_indexes(struct erofs_inode *inode, erofs_off_t off);
 int erofs_blob_write_chunked_file(struct erofs_inode *inode, int fd);
 int tarerofs_write_chunkes(struct erofs_inode *inode, erofs_off_t data_offset);
lib/blobchunk.c +1 -1
index cada5bb..07f18bd 100644
@@ -38,7 +38,7 @@ struct erofs_blobchunk erofs_holechunk = {
 };
 static LIST_HEAD(unhashed_blobchunks);
 
-static struct erofs_blobchunk *erofs_get_unhashed_chunk(unsigned int device_id,
+struct erofs_blobchunk *erofs_get_unhashed_chunk(unsigned int device_id,
 		erofs_blk_t blkaddr, erofs_off_t sourceoffset)
 {
 	struct erofs_blobchunk *chunk;
Signature · 1 line
2.19.1.6.gb485710b
author
#8 lore raw

PATCH v3 6/11 erofs-utils: lib: add erofs_read_xattrs_from_disk() helper

In reply to Jingbo Xu

Add erofs_read_xattrs_from_disk() helper reading extended attributes from disk, add checking if it's an opaque directory.

Move all xattr name related macros to xattr.c and introduce erofs_set_opaque_xattr() helper to hide all these details.

---
 include/erofs/internal.h |   1 +
 include/erofs/xattr.h    |  33 +-----------
 lib/tar.c                |   7 +--
 lib/xattr.c              | 112 +++++++++++++++++++++++++++++++++++++++
 4 files changed, 116 insertions(+), 37 deletions(-)
include/erofs/internal.h +1 -0
index 3e73eef..455a73a 100644
@@ -190,6 +190,7 @@ struct erofs_inode {
 	bool compressed_idata;
 	bool lazy_tailblock;
 	bool with_tmpfile;
+	bool opaque;
 
 	unsigned int xattr_isize;
 	unsigned int extent_isize;
include/erofs/xattr.h +2 -31
index 748442a..2c8f8dd 100644
@@ -43,37 +43,6 @@ static inline unsigned int xattrblock_offset(struct erofs_inode *vi,
 	(_size - sizeof(struct erofs_xattr_ibody_header)) / \
 	sizeof(struct erofs_xattr_entry) + 1; })
 
-#ifndef XATTR_SYSTEM_PREFIX
-#define XATTR_SYSTEM_PREFIX	"system."
-#endif
-#ifndef XATTR_SYSTEM_PREFIX_LEN
-#define XATTR_SYSTEM_PREFIX_LEN (sizeof(XATTR_SYSTEM_PREFIX) - 1)
-#endif
-#ifndef XATTR_USER_PREFIX
-#define XATTR_USER_PREFIX	"user."
-#endif
-#ifndef XATTR_USER_PREFIX_LEN
-#define XATTR_USER_PREFIX_LEN (sizeof(XATTR_USER_PREFIX) - 1)
-#endif
-#ifndef XATTR_SECURITY_PREFIX
-#define XATTR_SECURITY_PREFIX	"security."
-#endif
-#ifndef XATTR_SECURITY_PREFIX_LEN
-#define XATTR_SECURITY_PREFIX_LEN (sizeof(XATTR_SECURITY_PREFIX) - 1)
-#endif
-#ifndef XATTR_TRUSTED_PREFIX
-#define XATTR_TRUSTED_PREFIX	"trusted."
-#endif
-#ifndef XATTR_TRUSTED_PREFIX_LEN
-#define XATTR_TRUSTED_PREFIX_LEN (sizeof(XATTR_TRUSTED_PREFIX) - 1)
-#endif
-#ifndef XATTR_NAME_POSIX_ACL_ACCESS
-#define XATTR_NAME_POSIX_ACL_ACCESS "system.posix_acl_access"
-#endif
-#ifndef XATTR_NAME_POSIX_ACL_DEFAULT
-#define XATTR_NAME_POSIX_ACL_DEFAULT "system.posix_acl_default"
-#endif
-
 int erofs_scan_file_xattrs(struct erofs_inode *inode);
 int erofs_prepare_xattr_ibody(struct erofs_inode *inode);
 char *erofs_export_xattr_ibody(struct list_head *ixattrs, unsigned int size);
@@ -87,6 +56,8 @@ int erofs_xattr_prefixes_init(struct erofs_sb_info *sbi);
 
 int erofs_setxattr(struct erofs_inode *inode, char *key,
 		   const void *value, size_t size);
+int erofs_set_opaque_xattr(struct erofs_inode *inode);
+int erofs_read_xattrs_from_disk(struct erofs_inode *inode);
 
 #ifdef __cplusplus
 }
lib/tar.c +1 -6
index 328ab98..ce54d17 100644
@@ -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];
@@ -633,7 +628,7 @@ restart:
 	} else if (opq) {
 		DBG_BUGON(d->type == EROFS_FT_UNKNOWN);
 		DBG_BUGON(!d->inode);
-		ret = erofs_setxattr(d->inode, OVL_XATTR_OPAQUE, "y", 1);
+		ret = erofs_set_opaque_xattr(d->inode);
 		goto out;
 	} else if (th.typeflag == '1') {	/* hard link cases */
 		struct erofs_dentry *d2;
lib/xattr.c +112 -0

130 lines not on this page · raw message

Signature · 1 line
2.19.1.6.gb485710b
author
#9 lore raw

PATCH v3 7/11 erofs-utils: lib: add erofs_insert_ihash() helper

In reply to Jingbo Xu

Add erofs_insert_ihash() helper inserting inode into inode hash table.

Also add prototypes of erofs_iget() and erofs_iget_by_nid() in the header file.

---
 include/erofs/inode.h |  3 +++
 lib/inode.c           | 10 +++++++---
 2 files changed, 10 insertions(+), 3 deletions(-)
include/erofs/inode.h +3 -0
index e8a5670..1c602a8 100644
@@ -25,6 +25,9 @@ u32 erofs_new_encode_dev(dev_t dev);
 unsigned char erofs_mode_to_ftype(umode_t mode);
 unsigned char erofs_ftype_to_dtype(unsigned int filetype);
 void erofs_inode_manager_init(void);
+void erofs_insert_ihash(struct erofs_inode *inode, dev_t dev, ino_t ino);
+struct erofs_inode *erofs_iget(dev_t dev, ino_t ino);
+struct erofs_inode *erofs_iget_by_nid(erofs_nid_t nid);
 unsigned int erofs_iput(struct erofs_inode *inode);
 erofs_nid_t erofs_lookupnid(struct erofs_inode *inode);
 struct erofs_dentry *erofs_d_alloc(struct erofs_inode *parent,
lib/inode.c +7 -3
index d54f84f..b967aab 100644
@@ -75,6 +75,12 @@ void erofs_inode_manager_init(void)
 		init_list_head(&inode_hashtable[i]);
 }
 
+void erofs_insert_ihash(struct erofs_inode *inode, dev_t dev, ino_t ino)
+{
+	list_add(&inode->i_hash,
+		 &inode_hashtable[(ino ^ dev) % NR_INODE_HASHTABLE]);
+}
+
 /* get the inode from the (source) inode # */
 struct erofs_inode *erofs_iget(dev_t dev, ino_t ino)
 {
@@ -976,9 +982,7 @@ static int erofs_fill_inode(struct erofs_inode *inode, struct stat *st,
 		inode->inode_isize = sizeof(struct erofs_inode_compact);
 	}
 
-	list_add(&inode->i_hash,
-		 &inode_hashtable[(st->st_ino ^ st->st_dev) %
-				  NR_INODE_HASHTABLE]);
+	erofs_insert_ihash(inode, st->st_dev, st->st_ino);
 	return 0;
 }
 
Signature · 1 line
2.19.1.6.gb485710b
author
#10 lore raw

PATCH v3 8/11 erofs-utils: lib: add erofs_rebuild_dump_tree() helper

In reply to Jingbo Xu

Enhance tarerofs_dump_tree() so that it could optionally skip specified files, usually for whiteout files.

Rename it to erofs_rebuild_dump_tree().

---
 include/erofs/inode.h    |  2 +-
 include/erofs/internal.h |  1 +
 lib/inode.c              | 15 +++++++++++----
 mkfs/main.c              |  2 +-
 4 files changed, 14 insertions(+), 6 deletions(-)
include/erofs/inode.h +1 -1
index 1c602a8..fe9dda2 100644
@@ -32,7 +32,7 @@ unsigned int erofs_iput(struct erofs_inode *inode);
 erofs_nid_t erofs_lookupnid(struct erofs_inode *inode);
 struct erofs_dentry *erofs_d_alloc(struct erofs_inode *parent,
 				   const char *name);
-int tarerofs_dump_tree(struct erofs_inode *dir);
+int erofs_rebuild_dump_tree(struct erofs_inode *dir);
 int erofs_init_empty_dir(struct erofs_inode *dir);
 struct erofs_inode *erofs_new_inode(void);
 struct erofs_inode *erofs_mkfs_build_tree_from_path(const char *path);
include/erofs/internal.h +1 -0
index 455a73a..fa0a240 100644
@@ -191,6 +191,7 @@ struct erofs_inode {
 	bool lazy_tailblock;
 	bool with_tmpfile;
 	bool opaque;
+	bool drop;
 
 	unsigned int xattr_isize;
 	unsigned int extent_isize;
lib/inode.c +11 -4
index b967aab..96012e4 100644
@@ -1323,9 +1323,9 @@ struct erofs_inode *erofs_mkfs_build_special_from_fd(int fd, const char *name)
 	return inode;
 }
 
-int tarerofs_dump_tree(struct erofs_inode *dir)
+int erofs_rebuild_dump_tree(struct erofs_inode *dir)
 {
-	struct erofs_dentry *d;
+	struct erofs_dentry *d, *n;
 	unsigned int nr_subdirs;
 	int ret;
 
@@ -1369,8 +1369,15 @@ int tarerofs_dump_tree(struct erofs_inode *dir)
 	}
 
 	nr_subdirs = 0;
-	list_for_each_entry(d, &dir->i_subdirs, d_child)
+	list_for_each_entry_safe(d, n, &dir->i_subdirs, d_child) {
+		if (d->inode->drop) {
+			list_del(&d->d_child);
+			erofs_d_invalidate(d);
+			free(d);
+			continue;
+		}
 		++nr_subdirs;
+	}
 
 	ret = erofs_prepare_dir_layout(dir, nr_subdirs);
 	if (ret)
@@ -1391,7 +1398,7 @@ int tarerofs_dump_tree(struct erofs_inode *dir)
 			continue;
 
 		inode = erofs_igrab(d->inode);
-		ret = tarerofs_dump_tree(inode);
+		ret = erofs_rebuild_dump_tree(inode);
 		dir->i_nlink += (erofs_mode_to_ftype(inode->i_mode) == EROFS_FT_DIR);
 		erofs_iput(inode);
 		if (ret)
mkfs/main.c +1 -1
index c03a7a8..628af59 100644
@@ -946,7 +946,7 @@ int main(int argc, char **argv)
 		if (err < 0)
 			goto exit;
 
-		err = tarerofs_dump_tree(root_inode);
+		err = erofs_rebuild_dump_tree(root_inode);
 		if (err < 0)
 			goto exit;
 	}
Signature · 1 line
2.19.1.6.gb485710b
author
#11 lore raw

PATCH v3 9/11 erofs-utils: lib: add erofs_rebuild_get_dentry() helper

In reply to Jingbo Xu

Rename tarerofs_get_dentry() to erofs_rebuild_get_dentry().

Also make whout and 'opq' parameter optional when aufs is false.

---
 include/erofs/rebuild.h |  19 +++++++
 lib/Makefile.am         |   3 +-
 lib/rebuild.c           | 117 ++++++++++++++++++++++++++++++++++++++++
 lib/tar.c               | 109 ++-----------------------------------
 4 files changed, 141 insertions(+), 107 deletions(-)
 create mode 100644 include/erofs/rebuild.h
 create mode 100644 lib/rebuild.c
include/erofs/rebuild.h new file +19 -0
new file mode 100644
index 0000000..92873c9
@@ -0,0 +1,19 @@
+/* SPDX-License-Identifier: GPL-2.0+ OR Apache-2.0 */
+#ifndef __EROFS_REBUILD_H
+#define __EROFS_REBUILD_H
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+#include "internal.h"
+
+struct erofs_dentry *erofs_rebuild_get_dentry(struct erofs_inode *pwd,
+		char *path, bool aufs, bool *whout, bool *opq);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
lib/Makefile.am +2 -1
index 7a5dc03..4bcc09b 100644
@@ -24,6 +24,7 @@ noinst_HEADERS = $(top_srcdir)/include/erofs_fs.h \
       $(top_srcdir)/include/erofs/xattr.h \
       $(top_srcdir)/include/erofs/compress_hints.h \
       $(top_srcdir)/include/erofs/fragments.h \
+      $(top_srcdir)/include/erofs/rebuild.h \
       $(top_srcdir)/lib/liberofs_private.h
 
 noinst_HEADERS += compressor.h
@@ -31,7 +32,7 @@ liberofs_la_SOURCES = config.c io.c cache.c super.c inode.c xattr.c exclude.c \
 		      namei.c data.c compress.c compressor.c zmap.c decompress.c \
 		      compress_hints.c hashmap.c sha256.c blobchunk.c dir.c \
 		      fragments.c rb_tree.c dedupe.c uuid_unparse.c uuid.c tar.c \
-		      block_list.c
+		      block_list.c rebuild.c
 
 liberofs_la_CFLAGS = -Wall ${libuuid_CFLAGS} -I$(top_srcdir)/include
 if ENABLE_LZ4
lib/rebuild.c new file +117 -0

117 lines not on this page · raw message

lib/tar.c +3 -106

139 lines not on this page · raw message

Signature · 1 line
2.19.1.6.gb485710b
author
#12 lore raw

PATCH v3 10/11 erofs-utils: lib: add erofs_rebuild_load_tree() helper

In reply to Jingbo Xu

Add erofs_rebuild_load_tree() helper loading inode tree from given erofs image, and making it merged into a given inode tree in an overlayfs like model.

Since we need to read the content of the symlink file from disk when loading tree, add dependency on zlib_LIBS for mkfs.erofs.

---
 include/erofs/internal.h |   3 +
 include/erofs/rebuild.h  |   2 +
 lib/rebuild.c            | 278 +++++++++++++++++++++++++++++++++++++++
 lib/tar.c                |   2 -
 4 files changed, 283 insertions(+), 2 deletions(-)
include/erofs/internal.h +3 -0
index fa0a240..2559892 100644
@@ -108,6 +108,7 @@ struct erofs_sb_info {
 
 	int devfd;
 	u64 devsz;
+	dev_t dev;
 	unsigned int nblobs;
 	unsigned int blobfd[256];
 };
@@ -424,6 +425,8 @@ static inline u32 erofs_crc32c(u32 crc, const u8 *in, size_t len)
 	return crc;
 }
 
+#define EROFS_WHITEOUT_DEV	0
+
 #ifdef __cplusplus
 }
 #endif
include/erofs/rebuild.h +2 -0
index 92873c9..3ac074c 100644
@@ -12,6 +12,8 @@ extern "C"
 struct erofs_dentry *erofs_rebuild_get_dentry(struct erofs_inode *pwd,
 		char *path, bool aufs, bool *whout, bool *opq);
 
+int erofs_rebuild_load_tree(struct erofs_inode *root, struct erofs_sb_info *sbi);
+
 #ifdef __cplusplus
 }
 #endif
lib/rebuild.c +278 -0

290 lines not on this page · raw message

lib/tar.c +0 -2
index cf3497f..26830f4 100644
@@ -13,8 +13,6 @@
 #include "erofs/blobchunk.h"
 #include "erofs/rebuild.h"
 
-#define EROFS_WHITEOUT_DEV	0
-
 static char erofs_libbuf[16384];
 
 struct tar_header {
Signature · 1 line
2.19.1.6.gb485710b
author
#13 lore raw

PATCH v3 11/11 erofs-utils: mkfs: introduce rebuild mode

In reply to Jingbo Xu

Introduce a new rebuild mode merging multiple erofs images generated from either tarerfs index mode (--tar=i):

	mkfs.erofs --tar=i --aufs layer0.erofs layer0.tar
	...
	mkfs.erofs --tar=i --aufs layerN.erofs layerN.tar

	mkfs.erofs merge.erofs layerN.erofs ... layer0.erofs

or tarerofs non-index mode (--tar=f):

	mkfs.erofs --tar=f -Enoinline_data --aufs layer0.erofs layer0.tar
	...
	mkfs.erofs --tar=f -Enoinline_data --aufs layerN.erofs layerN.tar

	mkfs.erofs merge.erofs layerN.erofs ... layer0.erofs

When calling rebuild mode, the top most layer must be specified firstly in the cmdline, while the bottom most layer i.e. layer0 the lastly.

The rebuild mode doesn't support flat inline datalayout yet.

---
 include/erofs/internal.h |   2 +
 mkfs/main.c              | 197 +++++++++++++++++++++++++++++++--------
 2 files changed, 158 insertions(+), 41 deletions(-)
include/erofs/internal.h +2 -0
index 2559892..517352f 100644
@@ -111,6 +111,8 @@ struct erofs_sb_info {
 	dev_t dev;
 	unsigned int nblobs;
 	unsigned int blobfd[256];
+
+	struct list_head list;
 };
 
 /* make sure that any user of the erofs headers has atleast 64bit off_t type */
mkfs/main.c +156 -41

276 lines not on this page · raw message

Signature · 1 line
2.19.1.6.gb485710b