v4: - patch 2: the original two v3 patches[1][2] are merged as patch 2; also update commit message - patch 10: newly added; introduce "--keep-whiteout=[0|1]" option for tarfs and rebuild mode controlling whether whiteout files are kept in the generated image. - patch 9: add documentation for tarfs and rebuild mode in the usage message of mkfs.erofs
[1] https://lore.kernel.org/all/20230822092457.114686-2-jeffl...@linux.alibaba.com/ [2] https://lore.kernel.org/all/20230822092457.114686-3-jeffl...@linux.alibaba.com/ v1: https://lore.kernel.org/all/20230814034239.54660-1-jeffl...@linux.alibaba.com/ v2: https://lore.kernel.org/all/20230816021347.126886-1-jeffl...@linux.alibaba.com/ v3: https://lore.kernel.org/all/20230822092457.114686-1-jeffl...@linux.alibaba.com/ ------------------------- 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 (10): erofs-utils: lib: fix dirent type of whiteout in tarerofs erofs-utils: lib: keep erofs_init_devices in sync with kernel 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_get_dentry() helper erofs-utils: lib: add erofs_rebuild_load_tree() helper erofs-utils: mkfs: introduce rebuild mode erofs-utils: mkfs: add --keep-whiteout option for tarfs and rebuild mode include/erofs/blobchunk.h | 2 + include/erofs/config.h | 1 + include/erofs/inode.h | 5 +- include/erofs/internal.h | 6 + include/erofs/list.h | 20 ++ include/erofs/rebuild.h | 21 +++ include/erofs/xattr.h | 33 +--- lib/Makefile.am | 3 +- lib/blobchunk.c | 2 +- lib/config.c | 1 + lib/inode.c | 31 ++- lib/rebuild.c | 388 ++++++++++++++++++++++++++++++++++++++ lib/super.c | 9 +- lib/tar.c | 119 +----------- lib/xattr.c | 112 +++++++++++ mkfs/main.c | 221 +++++++++++++++++----- 16 files changed, 772 insertions(+), 202 deletions(-) create mode 100644 include/erofs/rebuild.h create mode 100644 lib/rebuild.c -- 2.19.1.6.gb485710b
