[PATCH v6 00/11] erofs-utils: mkfs: introduce rebuild mode

Jingbo Xu jefflexu at linux.alibaba.com
Tue Sep 5 20:02:16 AEST 2023


v6:
- newly add cleanup patches (patch 1 and 9)
- patch 8: improve the code of parsing multiple sources with "do {}
  while" loop
- patch 10: newly added to work around the potential issue of exposing
  whiteouts in the overlayfs mount by setting origin xattr on parent
  directory of whiteouts
- patch 11: the former "--keep-whiteout" option is renamed to
  "--overlay-strip" option; apart from whiteouts, origin xattrs will
  also be stripped when the option is enabled

[1] https://lore.kernel.org/all/20230822092457.114686-2-jefflexu@linux.alibaba.com/
[2] https://lore.kernel.org/all/20230822092457.114686-3-jefflexu@linux.alibaba.com/

v1: https://lore.kernel.org/all/20230814034239.54660-1-jefflexu@linux.alibaba.com/
v2: https://lore.kernel.org/all/20230816021347.126886-1-jefflexu@linux.alibaba.com/
v3: https://lore.kernel.org/all/20230822092457.114686-1-jefflexu@linux.alibaba.com/
v4: https://lore.kernel.org/all/20230823071517.12303-1-jefflexu@linux.alibaba.com/
v5: https://lore.kernel.org/all/20230901094706.27539-1-jefflexu@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 (11):
  erofs-utils: lib: remove unneeded NULL checking for returned item
  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: lib: add erofs_inode_is_whiteout() helper
  erofs-utils: lib: set origin xattr on parent directory of whiteout
  erofs-utils: mkfs: add --overlay-strip 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  |  11 +
 include/erofs/list.h      |  20 ++
 include/erofs/rebuild.h   |  21 ++
 include/erofs/xattr.h     |  36 +---
 lib/Makefile.am           |   3 +-
 lib/blobchunk.c           |   2 +-
 lib/inode.c               |  26 ++-
 lib/rebuild.c             | 409 ++++++++++++++++++++++++++++++++++++++
 lib/tar.c                 | 129 ++----------
 lib/xattr.c               | 144 +++++++++++++-
 mkfs/main.c               | 228 ++++++++++++++++-----
 14 files changed, 827 insertions(+), 210 deletions(-)
 create mode 100644 include/erofs/rebuild.h
 create mode 100644 lib/rebuild.c

-- 
2.19.1.6.gb485710b



More information about the Linux-erofs mailing list