v5: - patch 6: reuse the new allocated inode; call erofs_rebuild_get_dentry() first, and then erofs_read_inode_from_disk() is called only when erofs_rebuild_get_dentry() indicates a valid location of this inode (Gao Xiang) - patch 7: add new helper erofs_alloc_root_inode()
[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]/ v3: https://lore.kernel.org/all/[email protected]/ v4: 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 (8): 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 | 400 ++++++++++++++++++++++++++++++++++++++ lib/tar.c | 118 +---------- lib/xattr.c | 112 +++++++++++ mkfs/main.c | 229 +++++++++++++++++----- 15 files changed, 781 insertions(+), 203 deletions(-) create mode 100644 include/erofs/rebuild.h create mode 100644 lib/rebuild.c -- 2.19.1.6.gb485710b
