erofs-utils: dump,fsck,fuse: support metadata compression
PATCH v2 1/2 erofs-utils: dump,fsck,fuse: support metadata compression
Source kernel commit: 3f59153f08cc7ab3d6686f6ee1960232fd0426d3 Source kernel commit: c1fed66045986c0f0153912a87b0de511f8781a7
---
v1: https://lore.kernel.org/r/[email protected]
changes since v1:
- Fill up the final commit ids;
- BIT() -> BIT_ULL().
dump/main.c | 10 +++++++++- fsck/main.c | 25 ++++++++++++++--------- include/erofs/internal.h | 19 ++++++++++++------ include/erofs_fs.h | 12 ++++++++--- lib/data.c | 43 ++++++++++++++++++++++++++++++++++------ lib/namei.c | 5 +++-- lib/super.c | 29 +++++++++++++++++++++------ lib/xattr.c | 12 +++++------ lib/zmap.c | 15 ++++++++------ 9 files changed, 125 insertions(+), 45 deletions(-)
dump/main.c +9 -1
@@ -105,6 +105,7 @@ static struct erofsdump_feature feature_lists[] = { { false, EROFS_FEATURE_INCOMPAT_DEDUPE, "dedupe" }, { false, EROFS_FEATURE_INCOMPAT_XATTR_PREFIXES, "xattr_prefixes" }, { false, EROFS_FEATURE_INCOMPAT_48BIT, "48bit" }, + { false, EROFS_FEATURE_INCOMPAT_METABOX, "metabox" }, };static int erofsdump_readdir (struct erofs_dir_context *ctx);
@@ -163,7 +164,11 @@ static int erofsdump_parse_options_cfg(int argc, char **argv)exit (0 );case 2 : dumpcfg.show_inode = true; - dumpcfg.nid = (erofs_nid_t )atoll (optarg); + dumpcfg.nid =strtoull (optarg, &endptr,0 ); +if (*endptr !='\0' ) { +erofs_err ("invalid NID %s" , optarg); +return -EINVAL ; + } ++dumpcfg.totalshow;break ;case 'h' :
@@ -643,6 +648,9 @@ static void erofsdump_show_superblock(void)if (erofs_sb_has_fragments (&g_sbi) && g_sbi.packed_nid >0 )fprintf (stdout,"Filesystem packed nid: %llu\n" , g_sbi.packed_nid |0ULL ); +if (erofs_sb_has_metabox (&g_sbi)) +fprintf (stdout,"Filesystem metabox nid: %llu\n" , + g_sbi.metabox_nid |0ULL );if (erofs_sb_has_compr_cfgs (&g_sbi)) {fprintf (stdout,"Filesystem compr_algs: " ); erofsdump_print_supported_compressors(stdout,
fsck/main.c +16 -9
@@ -333,12 +333,14 @@ static int erofs_verify_xattr(struct erofs_inode *inode)struct erofs_sb_info *sbi = inode->sbi;unsigned int xattr_hdr_size =sizeof (struct erofs_xattr_ibody_header );unsigned int xattr_entry_size =sizeof (struct erofs_xattr_entry ); -erofs_off_t addr; +struct erofs_buf buf = __EROFS_BUF_INITIALIZER;unsigned int ofs, xattr_shared_count;struct erofs_xattr_ibody_header *ih;struct erofs_xattr_entry *entry; -int i, remaining = inode->xattr_isize, ret =0 ; -char buf[EROFS_MAX_BLOCK_SIZE ]; +int remaining = inode->xattr_isize, ret =0 ; +erofs_off_t addr; +char *ptr; +int i;if (inode->xattr_isize == xattr_hdr_size) { erofs_err("xattr_isize %d of nid %llu is not supported yet",
@@ -355,13 +357,15 @@ static int erofs_verify_xattr(struct erofs_inode *inode) } addr =erofs_iloc (inode) + inode->inode_isize; - ret =erofs_dev_read (sbi,0 , buf, addr, xattr_hdr_size); -if (ret <0 ) { + ptr =erofs_read_metabuf (&buf, sbi, addr, +erofs_inode_in_metabox (inode)); +if (IS_ERR (ptr)) { + ret =PTR_ERR (ptr);erofs_err ("failed to read xattr header @ nid %llu: %d" , inode->nid |0ULL , ret); goto out; } - ih = (struct erofs_xattr_ibody_header *)buf; + ih = (struct erofs_xattr_ibody_header *)ptr; xattr_shared_count = ih->h_shared_count; ofs =erofs_blkoff (sbi, addr) + xattr_hdr_size;
@@ -385,14 +389,16 @@ static int erofs_verify_xattr(struct erofs_inode *inode)while (remaining >0 ) {unsigned int entry_sz; - ret =erofs_dev_read (sbi,0 , buf, addr, xattr_entry_size); -if (ret) { + ptr =erofs_read_metabuf (&buf, sbi, addr, +erofs_inode_in_metabox (inode)); +if (IS_ERR (ptr)) { + ret =PTR_ERR (ptr);erofs_err ("failed to read xattr entry @ nid %llu: %d" , inode->nid |0ULL , ret); goto out; } - entry = (struct erofs_xattr_entry *)buf; + entry = (struct erofs_xattr_entry *)ptr; entry_sz =erofs_xattr_entry_size (entry);if (remaining < entry_sz) { erofs_err("xattr on-disk corruption: xattr entry beyond xattr_isize @ nid %llu",
@@ -404,6 +410,7 @@ static int erofs_verify_xattr(struct erofs_inode *inode) remaining -= entry_sz; } out: +erofs_put_metabuf (&buf);return ret; }
include/erofs/internal.h +13 -6
@@ -126,6 +126,7 @@ struct erofs_sb_info {u16 device_id_mask;/* used for others */ };erofs_nid_t packed_nid; +erofs_nid_t metabox_nid;u32 xattr_prefix_start;u8 xattr_prefix_count;
@@ -153,8 +154,6 @@ struct erofs_sb_info {bool useqpl; }; -#define EROFS_SUPER_END (EROFS_SUPER_OFFSET + sizeof(struct erofs_super_block)) -/* make sure that any user of the erofs headers has atleast 64bit off_t type */ extern int erofs_assert_largefile[sizeof (off_t)-8 ];
@@ -182,6 +181,7 @@ EROFS_FEATURE_FUNCS(fragments, incompat, INCOMPAT_FRAGMENTS) EROFS_FEATURE_FUNCS(dedupe, incompat, INCOMPAT_DEDUPE) EROFS_FEATURE_FUNCS(xattr_prefixes, incompat, INCOMPAT_XATTR_PREFIXES) EROFS_FEATURE_FUNCS(48bit, incompat, INCOMPAT_48BIT) +EROFS_FEATURE_FUNCS(metabox, incompat, INCOMPAT_METABOX) EROFS_FEATURE_FUNCS(sb_chksum, compat, COMPAT_SB_CHKSUM)EROFS_FEATURE_FUNCS (xattr_filter, compat,COMPAT_XATTR_FILTER )
@@ -295,12 +295,18 @@ struct erofs_inode {#endif }; +static inline bool erofs_inode_in_metabox (struct erofs_inode *inode) +{ +return inode->nid >>EROFS_DIRENT_NID_METABOX_BIT ; +} +static inline erofs_off_t erofs_iloc (struct erofs_inode *inode) {struct erofs_sb_info *sbi = inode->sbi; +erofs_off_t base =erofs_inode_in_metabox (inode) ?0 : +erofs_pos (sbi, sbi->meta_blkaddr); -return erofs_pos (sbi, sbi->meta_blkaddr) + - (inode->nid <<EROFS_ISLOTBITS ); +return base + ((inode->nid &EROFS_DIRENT_NID_MASK ) <<EROFS_ISLOTBITS ); }static inline bool is_inode_layout_compression (struct erofs_inode *inode)
@@ -437,9 +443,10 @@ int erofs_ilookup(const char *path, struct erofs_inode *vi);static inline void erofs_unmap_metabuf (struct erofs_buf *buf) {}static inline void erofs_put_metabuf (struct erofs_buf *buf) {}void *erofs_bread (struct erofs_buf *buf,erofs_off_t offset,bool need_kmap); -void erofs_init_metabuf (struct erofs_buf *buf,struct erofs_sb_info *sbi); +void erofs_init_metabuf (struct erofs_buf *buf,struct erofs_sb_info *sbi, +bool in_mbox);void *erofs_read_metabuf (struct erofs_buf *buf,struct erofs_sb_info *sbi, -erofs_off_t offset); +erofs_off_t offset,bool in_mbox);int erofs_iopen (struct erofs_vfile *vf,struct erofs_inode *inode);int erofs_map_blocks (struct erofs_inode *inode,struct erofs_map_blocks *map,int flags);
include/erofs_fs.h +9 -3
@@ -32,8 +32,9 @@#define EROFS_FEATURE_INCOMPAT_DEDUPE 0x00000020#define EROFS_FEATURE_INCOMPAT_XATTR_PREFIXES 0x00000040#define EROFS_FEATURE_INCOMPAT_48BIT 0x00000080 +#define EROFS_FEATURE_INCOMPAT_METABOX 0x00000100#define EROFS_ALL_FEATURE_INCOMPAT \ - ((EROFS_FEATURE_INCOMPAT_48BIT << 1) - 1) + ((EROFS_FEATURE_INCOMPAT_METABOX << 1) - 1)#define EROFS_SB_EXTSLOT_SIZE 16
@@ -83,7 +84,9 @@ struct erofs_super_block {__u8 reserved[3 ];__le32 build_time;/* seconds added to epoch for mkfs time */ __le64 rootnid_8b;/* (48BIT on) nid of root directory */ -__u8 reserved2[8 ]; +__le64 reserved2; +__le64 metabox_nid;/* (METABOX on) nid of the metabox inode */ +__le64 reserved3; };/*
@@ -268,6 +271,9 @@ struct erofs_inode_chunk_index {__le32 startblk_lo;/* starting block number of this chunk */ }; +#define EROFS_DIRENT_NID_METABOX_BIT 63 +#define EROFS_DIRENT_NID_MASK (BIT_ULL(EROFS_DIRENT_NID_METABOX_BIT) - 1) +/* dirent sorts in alphabet order, thus we can do binary search */ struct erofs_dirent {__le64 nid;/* node number */
@@ -448,7 +454,7 @@ static inline void erofs_check_ondisk_layout_definitions(void) };#endif -BUILD_BUG_ON (sizeof (struct erofs_super_block ) !=128 ); +BUILD_BUG_ON (sizeof (struct erofs_super_block ) !=144 );BUILD_BUG_ON (sizeof (struct erofs_inode_compact ) !=32 );BUILD_BUG_ON (sizeof (struct erofs_inode_extended ) !=64 );BUILD_BUG_ON (sizeof (struct erofs_xattr_ibody_header ) !=12 );
lib/data.c +37 -6
73 lines not on this page · raw message
lib/namei.c +3 -2
@@ -27,6 +27,7 @@ int erofs_read_inode_from_disk(struct erofs_inode *vi)struct erofs_sb_info *sbi = vi->sbi;erofs_blk_t blkaddr =erofs_blknr (sbi,erofs_iloc (vi));unsigned int ofs =erofs_blkoff (sbi,erofs_iloc (vi)); +bool in_mbox =erofs_inode_in_metabox (vi);struct erofs_buf buf = __EROFS_BUF_INITIALIZER;erofs_blk_t addrmask =BIT_ULL (48 ) -1 ;struct erofs_inode_extended *die, copied;
@@ -35,7 +36,7 @@ int erofs_read_inode_from_disk(struct erofs_inode *vi)void *ptr;int err =0 ; - ptr =erofs_read_metabuf (&buf, sbi,erofs_pos (sbi, blkaddr)); + ptr =erofs_read_metabuf (&buf, sbi,erofs_pos (sbi, blkaddr), in_mbox);if (IS_ERR (ptr)) { err =PTR_ERR (ptr); erofs_err("failed to get inode (nid: %llu) page, err %d",
@@ -74,7 +75,7 @@ int erofs_read_inode_from_disk(struct erofs_inode *vi)memcpy (&copied, dic, gotten); ptr =erofs_read_metabuf (&buf, sbi, -erofs_pos (sbi, blkaddr +1 )); +erofs_pos (sbi, blkaddr +1 ), in_mbox);if (IS_ERR (ptr)) { err =PTR_ERR (ptr); erofs_err("failed to get inode payload block (nid: %llu), err %d",
lib/super.c +23 -6
@@ -79,7 +79,7 @@ int erofs_read_superblock(struct erofs_sb_info *sbi)int read, ret; read =erofs_io_pread (&sbi->bdev, data,EROFS_MAX_BLOCK_SIZE ,0 ); -if (read <EROFS_SUPER_END ) { +if (read <EROFS_SUPER_OFFSET +sizeof (*dsb)) { ret = read <0 ? read : -EIO ;erofs_err ("cannot read erofs superblock: %s" ,erofs_strerror (ret));
@@ -123,6 +123,12 @@ int erofs_read_superblock(struct erofs_sb_info *sbi) sbi->root_nid =le16_to_cpu (dsb->rb.rootnid_2b); } sbi->packed_nid =le64_to_cpu (dsb->packed_nid); +if (erofs_sb_has_metabox (sbi)) { +if (sbi->sb_size <= offsetof(struct erofs_super_block , + metabox_nid)) +return -EFSCORRUPTED ; + sbi->metabox_nid =le64_to_cpu (dsb->metabox_nid); + } sbi->inos =le64_to_cpu (dsb->inos); sbi->checksum =le32_to_cpu (dsb->checksum);
@@ -187,7 +193,6 @@ int erofs_writesb(struct erofs_sb_info *sbi, struct erofs_buffer_head *sb_bh) .devt_slotoff = cpu_to_le16(sbi->devt_slotoff), .packed_nid = cpu_to_le64(sbi->packed_nid), }; -const u32 sb_blksize =round_up (EROFS_SUPER_END ,erofs_blksiz (sbi));char *buf;int ret;
@@ -205,16 +210,21 @@ int erofs_writesb(struct erofs_sb_info *sbi, struct erofs_buffer_head *sb_bh)else sb.u1.lz4_max_distance =cpu_to_le16 (sbi->lz4.max_distance); - buf =calloc (sb_blksize,1 ); +if (erofs_sb_has_metabox (sbi)) + sb.metabox_nid =cpu_to_le64 (sbi->metabox_nid); + sb.sb_extslots = (sbi->sb_size -128 ) >>4 ; + + buf =calloc (round_up (EROFS_SUPER_OFFSET + sbi->sb_size, +erofs_blksiz (sbi)),1 );if (!buf) {erofs_err ("failed to allocate memory for sb: %s" ,erofs_strerror (-errno));return -ENOMEM ; } -memcpy (buf +EROFS_SUPER_OFFSET , &sb,sizeof (sb)); +memcpy (buf +EROFS_SUPER_OFFSET , &sb, sbi->sb_size); ret =erofs_dev_write (sbi, buf, sb_bh ?erofs_btell (sb_bh, false) :0 , -EROFS_SUPER_END ); +EROFS_SUPER_OFFSET + sbi->sb_size);free (buf);if (sb_bh)erofs_bdrop (sb_bh, false);
@@ -223,9 +233,16 @@ int erofs_writesb(struct erofs_sb_info *sbi, struct erofs_buffer_head *sb_bh)struct erofs_buffer_head *erofs_reserve_sb (struct erofs_bufmgr *bmgr) { +struct erofs_sb_info *sbi = bmgr->sbi;struct erofs_buffer_head *bh; +unsigned int sb_size =128 ;int err; +if (erofs_sb_has_metabox (sbi) && + sb_size <= offsetof(struct erofs_super_block , metabox_nid)) + sb_size = offsetof(struct erofs_super_block , metabox_nid) +8 ; + sbi->sb_size =round_up (sb_size,16 ); + bh =erofs_balloc (bmgr,META ,0 ,0 );if (IS_ERR (bh)) { erofs_err("failed to allocate super: %s",
@@ -233,7 +250,7 @@ struct erofs_buffer_head *erofs_reserve_sb(struct erofs_bufmgr *bmgr)return bh; } bh->op = &erofs_skip_write_bhops; - err =erofs_bh_balloon (bh,EROFS_SUPER_END ); + err =erofs_bh_balloon (bh,EROFS_SUPER_OFFSET + sbi->sb_size);if (err <0 ) {erofs_err ("failed to balloon super: %s" ,erofs_strerror (err)); goto err_bdrop;
lib/xattr.c +6 -6
@@ -1079,7 +1079,7 @@ static int init_inode_xattrs(struct erofs_inode *vi) it.ofs =erofs_blkoff (sbi,erofs_iloc (vi) + vi->inode_isize);/* read in shared xattr array (non-atomic, see kmalloc below) */ - it.kaddr =erofs_read_metabuf (&it.buf, sbi,erofs_pos (sbi, it.blkaddr)); + it.kaddr =erofs_read_metabuf (&it.buf, sbi,erofs_pos (sbi, it.blkaddr), false);if (IS_ERR (it.kaddr))return PTR_ERR (it.kaddr);
@@ -1101,7 +1101,7 @@ static int init_inode_xattrs(struct erofs_inode *vi)DBG_BUGON (it.ofs !=erofs_blksiz (sbi)); it.kaddr =erofs_read_metabuf (&it.buf, sbi, -erofs_pos (sbi, ++it.blkaddr)); +erofs_pos (sbi, ++it.blkaddr), false);if (IS_ERR (it.kaddr)) {free (vi->xattr_shared_xattrs); vi->xattr_shared_xattrs =NULL ;
@@ -1143,7 +1143,7 @@ static inline int xattr_iter_fixup(struct xattr_iter *it) it->blkaddr +=erofs_blknr (sbi, it->ofs); it->kaddr =erofs_read_metabuf (&it->buf, sbi, -erofs_pos (sbi, it->blkaddr)); +erofs_pos (sbi, it->blkaddr), false);if (IS_ERR (it->kaddr))return PTR_ERR (it->kaddr); it->ofs =erofs_blkoff (sbi, it->ofs);
@@ -1168,7 +1168,7 @@ static int inline_xattr_iter_begin(struct xattr_iter *it, it->ofs =erofs_blkoff (sbi,erofs_iloc (vi) + inline_xattr_ofs); it->kaddr =erofs_read_metabuf (&it->buf, sbi, -erofs_pos (sbi, it->blkaddr)); +erofs_pos (sbi, it->blkaddr), false);if (IS_ERR (it->kaddr))return PTR_ERR (it->kaddr);return vi->xattr_isize - xattr_header_sz;
@@ -1393,7 +1393,7 @@ static int shared_getxattr(struct erofs_inode *vi, struct getxattr_iter *it) it->it.ofs =xattrblock_offset (vi, vi->xattr_shared_xattrs[i]); it->it.kaddr =erofs_read_metabuf (&it->it.buf, sbi, -erofs_pos (sbi, blkaddr)); +erofs_pos (sbi, blkaddr), false);if (IS_ERR (it->it.kaddr))return PTR_ERR (it->it.kaddr); it->it.blkaddr = blkaddr;
@@ -1548,7 +1548,7 @@ static int shared_listxattr(struct erofs_inode *vi, struct listxattr_iter *it) it->it.ofs =xattrblock_offset (vi, vi->xattr_shared_xattrs[i]); it->it.kaddr =erofs_read_metabuf (&it->it.buf, sbi, -erofs_pos (sbi, blkaddr)); +erofs_pos (sbi, blkaddr), false);if (IS_ERR (it->it.kaddr))return PTR_ERR (it->it.kaddr); it->it.blkaddr = blkaddr;
lib/zmap.c +9 -6
@@ -35,7 +35,8 @@ static int z_erofs_load_full_lcluster(struct z_erofs_maprecorder *m,struct z_erofs_lcluster_index *di;unsigned int advise; - di =erofs_read_metabuf (&m->map->buf, sbi, pos); + di =erofs_read_metabuf (&m->map->buf, sbi, pos, +erofs_inode_in_metabox (vi));if (IS_ERR (di))return PTR_ERR (di); m->lcn = lcn;
@@ -150,7 +151,8 @@ static int z_erofs_load_compact_lcluster(struct z_erofs_maprecorder *m,else return -EOPNOTSUPP ; - in =erofs_read_metabuf (&m->map->buf, sbi, pos); + in =erofs_read_metabuf (&m->map->buf, sbi, pos, +erofs_inode_in_metabox (vi));if (IS_ERR (in))return PTR_ERR (in);
@@ -541,6 +543,7 @@ static int z_erofs_map_blocks_ext(struct erofs_inode *vi,unsigned int recsz =z_erofs_extent_recsize (vi->z_advise);erofs_off_t pos =round_up (Z_EROFS_MAP_HEADER_END (erofs_iloc (vi) + vi->inode_isize + vi->xattr_isize), recsz); +bool in_mbox =erofs_inode_in_metabox (vi);erofs_off_t lend = vi->i_size;erofs_off_t l, r, mid, pa, la, lstart;struct z_erofs_extent *ext;
@@ -550,7 +553,7 @@ static int z_erofs_map_blocks_ext(struct erofs_inode *vi, map->m_flags =0 ;if (recsz <= offsetof(struct z_erofs_extent , pstart_hi)) {if (recsz <= offsetof(struct z_erofs_extent , pstart_lo)) { - ext =erofs_read_metabuf (&map->buf, sbi, pos); + ext =erofs_read_metabuf (&map->buf, sbi, pos, in_mbox);if (IS_ERR (ext))return PTR_ERR (ext); pa =le64_to_cpu (*(__le64 *)ext);
@@ -562,7 +565,7 @@ static int z_erofs_map_blocks_ext(struct erofs_inode *vi, }for (; lstart <= map->m_la; lstart +=1 << vi->z_lclusterbits) { - ext =erofs_read_metabuf (&map->buf, sbi, pos); + ext =erofs_read_metabuf (&map->buf, sbi, pos, in_mbox);if (IS_ERR (ext))return PTR_ERR (ext); map->m_plen =le32_to_cpu (ext->plen);
@@ -582,7 +585,7 @@ static int z_erofs_map_blocks_ext(struct erofs_inode *vi,for (l =0 , r = vi->z_extents; l < r; ) { mid = l + (r - l) /2 ; ext =erofs_read_metabuf (&map->buf, sbi, - pos + mid * recsz); + pos + mid * recsz, in_mbox);if (IS_ERR (ext))return PTR_ERR (ext);
@@ -651,7 +654,7 @@ static int z_erofs_fill_inode_lazy(struct erofs_inode *vi)return 0 ; pos =round_up (erofs_iloc (vi) + vi->inode_isize + vi->xattr_isize,8 ); - h =erofs_read_metabuf (&buf, sbi, pos); + h =erofs_read_metabuf (&buf, sbi, pos,erofs_inode_in_metabox (vi));if (IS_ERR (h))return PTR_ERR (h);
Signature · 1 line
2.43.5
PATCH v2 2/2 erofs-utils: introduce metadata compression [metabox]
This implements metadata compression for mkfs.erofs.
It introduces a new command-line option -m <size>[:algorithm]. If specified, all inode metadata will be kept in a special inode called the metabox inode.
The metabox inode will be compressed using the specified physical cluster size <size>. For example:
$ mkfs.erofs -zlzma -C1048576 -m 4096 foo.erofs foo
will compress metadata in 4096-byte pclusters.
EROFS supports multiple algorithms within a filesystem, so metadata can be compressed with a different algorithm. For instance, LZMA may be too slow for metadata, but users may still want to save metadata space:
$ mkfs.erofs -zlzma -C1048576 -m4096:lz4hc,12 foo.erofs foo Or $ mkfs.erofs -zlzma:lz4hc,12 -C1048576 -m4096:1 foo.erofs foo
will compress metadata in 4096-byte pclusters using LZ4HC level 12.
--- include/erofs/blobchunk.h | 3 +- include/erofs/compress.h | 11 ---- include/erofs/config.h | 2 + include/erofs/fragments.h | 5 ++ include/erofs/internal.h | 5 +- lib/Makefile.am | 5 +- lib/blobchunk.c | 6 +- lib/compress.c | 26 ++++++-- lib/config.c | 1 + lib/inode.c | 131 +++++++++++++++++++++++++------------- lib/liberofs_metabox.h | 20 ++++++ lib/metabox.c | 78 +++++++++++++++++++++++ mkfs/main.c | 65 +++++++++++++++++-- 13 files changed, 284 insertions(+), 74 deletions(-) create mode 100644 lib/liberofs_metabox.h create mode 100644 lib/metabox.c
include/erofs/blobchunk.h +2 -1
@@ -16,7 +16,8 @@ extern "C"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_write_chunk_indexes (struct erofs_inode *inode,struct erofs_vfile *vf, +erofs_off_t off);int erofs_blob_write_chunked_file (struct erofs_inode *inode,int fd,erofs_off_t startoff);int erofs_write_zero_inode (struct erofs_inode *inode);
include/erofs/compress.h +0 -11
@@ -30,17 +30,6 @@ int z_erofs_compress_exit(struct erofs_sb_info *sbi);const char *z_erofs_list_supported_algorithms (int i,unsigned int *mask);const struct erofs_algorithm *z_erofs_list_available_compressors (int *i); -static inline bool erofs_is_packed_inode (struct erofs_inode *inode) -{ -erofs_nid_t packed_nid = inode->sbi->packed_nid; - -if (inode->nid ==EROFS_PACKED_NID_UNALLOCATED ) { -DBG_BUGON (packed_nid !=EROFS_PACKED_NID_UNALLOCATED ); -return true; - } -return (packed_nid >0 && inode->nid == packed_nid); -} - #ifdef __cplusplus }#endif
include/erofs/config.h +2 -0
@@ -79,11 +79,13 @@ struct erofs_configure {struct erofs_compr_opts c_compr_opts[EROFS_MAX_COMPR_CFGS ];char c_force_inodeversion;char c_force_chunkformat; +u8 c_mkfs_metabox_algid;/* < 0, xattr disabled and INT_MAX, always use inline xattrs */ int c_inline_xattr_tolerance;u32 c_mkfs_pclustersize_max;u32 c_mkfs_pclustersize_def;u32 c_mkfs_pclustersize_packed; +s32 c_mkfs_pclustersize_metabox;u32 c_max_decompressed_extent_bytes;u64 c_unix_timestamp;u32 c_uid, c_gid;
include/erofs/fragments.h +5 -0
@@ -15,6 +15,11 @@ extern "C"extern const char *erofs_frags_packedname;#define EROFS_PACKED_INODE erofs_frags_packedname +static inline bool erofs_is_packed_inode (struct erofs_inode *inode) +{ +return inode->i_srcpath ==EROFS_PACKED_INODE ; +} +u32 z_erofs_fragments_tofh (struct erofs_inode *inode,int fd,erofs_off_t fpos);int erofs_fragment_findmatch (struct erofs_inode *inode,int fd,u32 tofh);
include/erofs/internal.h +3 -2
@@ -83,11 +83,10 @@ struct erofs_xattr_prefix_item {u8 infix_len; }; -#define EROFS_PACKED_NID_UNALLOCATED -1 -struct erofs_mkfs_dfops ;struct erofs_packed_inode ;struct z_erofs_mgr ; +struct erofs_metaboxmgr ;struct erofs_sb_info {struct erofs_sb_lz4_info lz4;
@@ -149,6 +148,7 @@ struct erofs_sb_info {#endif struct erofs_bufmgr *bmgr;struct z_erofs_mgr *zmgr; +struct erofs_metaboxmgr *m2gr;struct erofs_packed_inode *packedinode;struct erofs_buffer_head *bh_devt;bool useqpl;
@@ -245,6 +245,7 @@ struct erofs_inode {/* inline tail-end packing size */ unsigned short idata_size;char datasource; +bool in_metabox;bool compressed_idata;bool lazy_tailblock;bool opaque;
lib/Makefile.am +3 -2
@@ -28,7 +28,8 @@ noinst_HEADERS = $(top_srcdir)/include/erofs_fs.h \ $(top_srcdir)/include/erofs/fragments.h \ $(top_srcdir)/include/erofs/rebuild.h \ $(top_srcdir)/lib/liberofs_private.h \ - $(top_srcdir)/lib/liberofs_xxhash.h + $(top_srcdir)/lib/liberofs_xxhash.h \ + $(top_srcdir)/lib/liberofs_metabox.h noinst_HEADERS += compressor.h liberofs_la_SOURCES = config.c io.c cache.c super.c inode.c xattr.c exclude.c \
@@ -36,7 +37,7 @@ liberofs_la_SOURCES = config.c io.c cache.c super.c inode.c xattr.c exclude.c \ compress_hints.c hashmap.c sha256.c blobchunk.c dir.c \ fragments.c dedupe.c uuid_unparse.c uuid.c tar.c \ block_list.c rebuild.c diskbuf.c bitops.c dedupe_ext.c \ - vmdk.c + vmdk.c metabox.c liberofs_la_CFLAGS = -Wall ${libuuid_CFLAGS} -I$(top_srcdir)/include if ENABLE_LZ4
lib/blobchunk.c +3 -3
@@ -133,8 +133,8 @@ static int erofs_blob_hashmap_cmp(const void *a, const void *b, sizeof(ec1->sha256)); } -int erofs_blob_write_chunk_indexes (struct erofs_inode *inode, -erofs_off_t off) +int erofs_write_chunk_indexes (struct erofs_inode *inode,struct erofs_vfile *vf, +erofs_off_t off) {struct erofs_sb_info *sbi = inode->sbi;erofs_blk_t remaining_blks =BLK_ROUND_UP (sbi, inode->i_size);
@@ -202,7 +202,7 @@ int erofs_blob_write_chunk_indexes(struct erofs_inode *inode, source_offset, zeroedlen); } off =roundup (off, unit); -return erofs_io_pwrite (&sbi->bdev, inode->chunkindexes, +return erofs_io_pwrite (vf, inode->chunkindexes, off, inode->extent_isize); }
lib/compress.c +20 -6
@@ -25,6 +25,7 @@#ifdef EROFS_MT_ENABLED #include "erofs/workqueue.h" #endif +#include "liberofs_metabox.h" #define Z_EROFS_DESTBUF_SZ (Z_EROFS_PCLUSTER_MAX_SIZE + EROFS_MAX_BLOCK_SIZE * 2)
@@ -459,6 +460,8 @@ static unsigned int z_erofs_get_max_pclustersize(struct erofs_inode *inode) {if (erofs_is_packed_inode (inode)) {return cfg.c_mkfs_pclustersize_packed; + }else if (erofs_is_metabox_inode (inode)) { +return cfg.c_mkfs_pclustersize_metabox; #ifndef NDEBUG }else if (cfg.c_random_pclusterblks) { unsigned int pclusterblks =
@@ -567,7 +570,8 @@ static int __z_erofs_compress_one(struct z_erofs_compress_sctx *ctx,unsigned int len = ctx->tail - ctx->head;bool is_packed_inode =erofs_is_packed_inode (inode);bool tsg = (ctx->seg_idx +1 >= ictx->seg_num), final = !ctx->remaining; -bool may_packing = (cfg.c_fragments && tsg && final && !is_packed_inode); +bool may_packing = (cfg.c_fragments && tsg && final && !is_packed_inode && + !erofs_is_metabox_inode (inode));bool data_unaligned = ictx->data_unaligned;bool may_inline = (cfg.c_ztailpacking && !data_unaligned && tsg && final && !may_packing);
@@ -1247,6 +1251,7 @@ int z_erofs_compress_segment(struct z_erofs_compress_sctx *ctx,struct z_erofs_compress_ictx *ictx = ctx->ictx;struct erofs_inode *inode = ictx->inode;bool frag = cfg.c_fragments && !erofs_is_packed_inode (inode) && + !erofs_is_metabox_inode (inode) && ctx->seg_idx >= ictx->seg_num -1 ;int fd = ictx->fd;int ret;
@@ -1764,8 +1769,9 @@ void *erofs_begin_compressed_file(struct erofs_inode *inode, int fd, u64 fpos) {struct erofs_sb_info *sbi = inode->sbi;struct z_erofs_compress_ictx *ictx; -bool all_fragments = cfg.c_all_fragments && - !erofs_is_packed_inode (inode); +bool frag = cfg.c_fragments && !erofs_is_packed_inode (inode) && + !erofs_is_metabox_inode (inode); +bool all_fragments = cfg.c_all_fragments && frag;int ret;/* initialize per-file compression setting */
@@ -1799,8 +1805,10 @@ void *erofs_begin_compressed_file(struct erofs_inode *inode, int fd, u64 fpos)return ERR_PTR (-ENOMEM ); } ictx->fd = fd; - - ictx->ccfg = &sbi->zmgr->ccfg[inode->z_algorithmtype[0 ]]; +if (erofs_is_metabox_inode (inode)) + ictx->ccfg = &sbi->zmgr->ccfg[cfg.c_mkfs_metabox_algid]; +else + ictx->ccfg = &sbi->zmgr->ccfg[inode->z_algorithmtype[0 ]]; inode->z_algorithmtype[0 ] = ictx->ccfg->algorithmtype; inode->z_algorithmtype[1 ] =0 ; ictx->data_unaligned = erofs_sb_has_48bit(sbi) &&
@@ -1809,7 +1817,7 @@ void *erofs_begin_compressed_file(struct erofs_inode *inode, int fd, u64 fpos)if (cfg.c_fragments && !cfg.c_dedupe && !ictx->data_unaligned) inode->z_advise |=Z_EROFS_ADVISE_INTERLACED_PCLUSTER ; -if (cfg.c_fragments && !erofs_is_packed_inode (inode)) { +if (frag) { ictx->tofh =z_erofs_fragments_tofh (inode, fd, fpos);if (ictx == &g_ictx && cfg.c_fragdedupe !=FRAGDEDUPE_OFF ) {/*
@@ -2107,6 +2115,12 @@ int z_erofs_compress_init(struct erofs_sb_info *sbi, struct erofs_buffer_head *sreturn -EINVAL ; } +if (cfg.c_mkfs_pclustersize_metabox > (s32 )cfg.c_mkfs_pclustersize_max) { +erofs_err ("invalid pclustersize for the metabox file %u" , + cfg.c_mkfs_pclustersize_metabox); +return -EINVAL ; + } +if (sb_bh &&erofs_sb_has_compr_cfgs (sbi)) { ret =z_erofs_build_compr_cfgs (sbi, sb_bh, max_dict_size);if (ret)
lib/config.c +1 -0
@@ -36,6 +36,7 @@ void erofs_init_configure(void) cfg.c_uid =-1 ; cfg.c_gid =-1 ; cfg.c_max_decompressed_extent_bytes =-1 ; + cfg.c_mkfs_pclustersize_metabox =-1 ; erofs_stdout_tty =isatty (STDOUT_FILENO ); }
lib/inode.c +88 -43
285 lines not on this page · raw message
lib/liberofs_metabox.h new file +20 -0
@@ -0,0 +1,20 @@ +/* SPDX-License-Identifier: GPL-2.0+ OR Apache-2.0 */ +#ifndef __EROFS_LIB_LIBEROFS_METABOX_H +#define __EROFS_LIB_LIBEROFS_METABOX_H + +#include "erofs/internal.h" + +extern const char *erofs_metabox_identifier; +#define EROFS_METABOX_INODE erofs_metabox_identifier + +static inline bool erofs_is_metabox_inode (struct erofs_inode *inode) +{ +return inode->i_srcpath ==EROFS_METABOX_INODE ; +} + +void erofs_metabox_exit (struct erofs_sb_info *sbi); +int erofs_metabox_init (struct erofs_sb_info *sbi); +struct erofs_bufmgr *erofs_metabox_bmgr (struct erofs_sb_info *sbi); +int erofs_metabox_iflush (struct erofs_sb_info *sbi); + +#endif
lib/metabox.c new file +78 -0
78 lines not on this page · raw message
mkfs/main.c +59 -6
144 lines not on this page · raw message
Signature · 1 line
2.43.5
PATCH v3 2/2 erofs-utils: introduce metadata compression [metabox]
This implements metadata compression for mkfs.erofs.
It introduces a new command-line option -m <size>[:algorithm]. If specified, all inode metadata will be kept in a special inode called the metabox inode.
The metabox inode will be compressed using the specified physical cluster size <size>. For example:
$ mkfs.erofs -zlzma -C1048576 -m 4096 foo.erofs foo
will compress metadata in 4096-byte pclusters.
EROFS supports multiple algorithms within a filesystem, so metadata can be compressed with a different algorithm. For instance, LZMA may be too slow for metadata, but users may still want to save metadata space:
$ mkfs.erofs -zlzma -C1048576 -m4096:lz4hc,12 foo.erofs foo Or $ mkfs.erofs -zlzma:lz4hc,12 -C1048576 -m4096:1 foo.erofs foo
will compress metadata in 4096-byte pclusters using LZ4HC level 12.
---
change since v2:
- Assign EROFS_NID_UNALLOCATED for rebuild mode too;
include/erofs/blobchunk.h | 3 +- include/erofs/compress.h | 11 ---- include/erofs/config.h | 2 + include/erofs/fragments.h | 5 ++ include/erofs/inode.h | 2 + include/erofs/internal.h | 5 +- lib/Makefile.am | 5 +- lib/blobchunk.c | 6 +- lib/compress.c | 26 ++++++-- lib/config.c | 1 + lib/inode.c | 129 +++++++++++++++++++++++++------------- lib/liberofs_metabox.h | 20 ++++++ lib/metabox.c | 78 +++++++++++++++++++++++ lib/rebuild.c | 2 +- mkfs/main.c | 65 +++++++++++++++++-- 15 files changed, 285 insertions(+), 75 deletions(-) create mode 100644 lib/liberofs_metabox.h create mode 100644 lib/metabox.c
include/erofs/blobchunk.h +2 -1
@@ -16,7 +16,8 @@ extern "C"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_write_chunk_indexes (struct erofs_inode *inode,struct erofs_vfile *vf, +erofs_off_t off);int erofs_blob_write_chunked_file (struct erofs_inode *inode,int fd,erofs_off_t startoff);int erofs_write_zero_inode (struct erofs_inode *inode);
include/erofs/compress.h +0 -11
@@ -30,17 +30,6 @@ int z_erofs_compress_exit(struct erofs_sb_info *sbi);const char *z_erofs_list_supported_algorithms (int i,unsigned int *mask);const struct erofs_algorithm *z_erofs_list_available_compressors (int *i); -static inline bool erofs_is_packed_inode (struct erofs_inode *inode) -{ -erofs_nid_t packed_nid = inode->sbi->packed_nid; - -if (inode->nid ==EROFS_PACKED_NID_UNALLOCATED ) { -DBG_BUGON (packed_nid !=EROFS_PACKED_NID_UNALLOCATED ); -return true; - } -return (packed_nid >0 && inode->nid == packed_nid); -} - #ifdef __cplusplus }#endif
include/erofs/config.h +2 -0
@@ -79,11 +79,13 @@ struct erofs_configure {struct erofs_compr_opts c_compr_opts[EROFS_MAX_COMPR_CFGS ];char c_force_inodeversion;char c_force_chunkformat; +u8 c_mkfs_metabox_algid;/* < 0, xattr disabled and INT_MAX, always use inline xattrs */ int c_inline_xattr_tolerance;u32 c_mkfs_pclustersize_max;u32 c_mkfs_pclustersize_def;u32 c_mkfs_pclustersize_packed; +s32 c_mkfs_pclustersize_metabox;u32 c_max_decompressed_extent_bytes;u64 c_unix_timestamp;u32 c_uid, c_gid;
include/erofs/fragments.h +5 -0
@@ -15,6 +15,11 @@ extern "C"extern const char *erofs_frags_packedname;#define EROFS_PACKED_INODE erofs_frags_packedname +static inline bool erofs_is_packed_inode (struct erofs_inode *inode) +{ +return inode->i_srcpath ==EROFS_PACKED_INODE ; +} +u32 z_erofs_fragments_tofh (struct erofs_inode *inode,int fd,erofs_off_t fpos);int erofs_fragment_findmatch (struct erofs_inode *inode,int fd,u32 tofh);
include/erofs/inode.h +2 -0
@@ -15,6 +15,8 @@ extern "C"#include "erofs/internal.h" +#define EROFS_NID_UNALLOCATED -1ULL +static inline struct erofs_inode *erofs_igrab (struct erofs_inode *inode) { (void )erofs_atomic_inc_return (&inode->i_count);
include/erofs/internal.h +3 -2
@@ -83,11 +83,10 @@ struct erofs_xattr_prefix_item {u8 infix_len; }; -#define EROFS_PACKED_NID_UNALLOCATED -1 -struct erofs_mkfs_dfops ;struct erofs_packed_inode ;struct z_erofs_mgr ; +struct erofs_metaboxmgr ;struct erofs_sb_info {struct erofs_sb_lz4_info lz4;
@@ -149,6 +148,7 @@ struct erofs_sb_info {#endif struct erofs_bufmgr *bmgr;struct z_erofs_mgr *zmgr; +struct erofs_metaboxmgr *m2gr;struct erofs_packed_inode *packedinode;struct erofs_buffer_head *bh_devt;bool useqpl;
@@ -245,6 +245,7 @@ struct erofs_inode {/* inline tail-end packing size */ unsigned short idata_size;char datasource; +bool in_metabox;bool compressed_idata;bool lazy_tailblock;bool opaque;
lib/Makefile.am +3 -2
@@ -28,7 +28,8 @@ noinst_HEADERS = $(top_srcdir)/include/erofs_fs.h \ $(top_srcdir)/include/erofs/fragments.h \ $(top_srcdir)/include/erofs/rebuild.h \ $(top_srcdir)/lib/liberofs_private.h \ - $(top_srcdir)/lib/liberofs_xxhash.h + $(top_srcdir)/lib/liberofs_xxhash.h \ + $(top_srcdir)/lib/liberofs_metabox.h noinst_HEADERS += compressor.h liberofs_la_SOURCES = config.c io.c cache.c super.c inode.c xattr.c exclude.c \
@@ -36,7 +37,7 @@ liberofs_la_SOURCES = config.c io.c cache.c super.c inode.c xattr.c exclude.c \ compress_hints.c hashmap.c sha256.c blobchunk.c dir.c \ fragments.c dedupe.c uuid_unparse.c uuid.c tar.c \ block_list.c rebuild.c diskbuf.c bitops.c dedupe_ext.c \ - vmdk.c + vmdk.c metabox.c liberofs_la_CFLAGS = -Wall ${libuuid_CFLAGS} -I$(top_srcdir)/include if ENABLE_LZ4
lib/blobchunk.c +3 -3
@@ -133,8 +133,8 @@ static int erofs_blob_hashmap_cmp(const void *a, const void *b, sizeof(ec1->sha256)); } -int erofs_blob_write_chunk_indexes (struct erofs_inode *inode, -erofs_off_t off) +int erofs_write_chunk_indexes (struct erofs_inode *inode,struct erofs_vfile *vf, +erofs_off_t off) {struct erofs_sb_info *sbi = inode->sbi;erofs_blk_t remaining_blks =BLK_ROUND_UP (sbi, inode->i_size);
@@ -202,7 +202,7 @@ int erofs_blob_write_chunk_indexes(struct erofs_inode *inode, source_offset, zeroedlen); } off =roundup (off, unit); -return erofs_io_pwrite (&sbi->bdev, inode->chunkindexes, +return erofs_io_pwrite (vf, inode->chunkindexes, off, inode->extent_isize); }
lib/compress.c +20 -6
@@ -25,6 +25,7 @@#ifdef EROFS_MT_ENABLED #include "erofs/workqueue.h" #endif +#include "liberofs_metabox.h" #define Z_EROFS_DESTBUF_SZ (Z_EROFS_PCLUSTER_MAX_SIZE + EROFS_MAX_BLOCK_SIZE * 2)
@@ -459,6 +460,8 @@ static unsigned int z_erofs_get_max_pclustersize(struct erofs_inode *inode) {if (erofs_is_packed_inode (inode)) {return cfg.c_mkfs_pclustersize_packed; + }else if (erofs_is_metabox_inode (inode)) { +return cfg.c_mkfs_pclustersize_metabox; #ifndef NDEBUG }else if (cfg.c_random_pclusterblks) { unsigned int pclusterblks =
@@ -567,7 +570,8 @@ static int __z_erofs_compress_one(struct z_erofs_compress_sctx *ctx,unsigned int len = ctx->tail - ctx->head;bool is_packed_inode =erofs_is_packed_inode (inode);bool tsg = (ctx->seg_idx +1 >= ictx->seg_num), final = !ctx->remaining; -bool may_packing = (cfg.c_fragments && tsg && final && !is_packed_inode); +bool may_packing = (cfg.c_fragments && tsg && final && !is_packed_inode && + !erofs_is_metabox_inode (inode));bool data_unaligned = ictx->data_unaligned;bool may_inline = (cfg.c_ztailpacking && !data_unaligned && tsg && final && !may_packing);
@@ -1247,6 +1251,7 @@ int z_erofs_compress_segment(struct z_erofs_compress_sctx *ctx,struct z_erofs_compress_ictx *ictx = ctx->ictx;struct erofs_inode *inode = ictx->inode;bool frag = cfg.c_fragments && !erofs_is_packed_inode (inode) && + !erofs_is_metabox_inode (inode) && ctx->seg_idx >= ictx->seg_num -1 ;int fd = ictx->fd;int ret;
@@ -1764,8 +1769,9 @@ void *erofs_begin_compressed_file(struct erofs_inode *inode, int fd, u64 fpos) {struct erofs_sb_info *sbi = inode->sbi;struct z_erofs_compress_ictx *ictx; -bool all_fragments = cfg.c_all_fragments && - !erofs_is_packed_inode (inode); +bool frag = cfg.c_fragments && !erofs_is_packed_inode (inode) && + !erofs_is_metabox_inode (inode); +bool all_fragments = cfg.c_all_fragments && frag;int ret;/* initialize per-file compression setting */
@@ -1799,8 +1805,10 @@ void *erofs_begin_compressed_file(struct erofs_inode *inode, int fd, u64 fpos)return ERR_PTR (-ENOMEM ); } ictx->fd = fd; - - ictx->ccfg = &sbi->zmgr->ccfg[inode->z_algorithmtype[0 ]]; +if (erofs_is_metabox_inode (inode)) + ictx->ccfg = &sbi->zmgr->ccfg[cfg.c_mkfs_metabox_algid]; +else + ictx->ccfg = &sbi->zmgr->ccfg[inode->z_algorithmtype[0 ]]; inode->z_algorithmtype[0 ] = ictx->ccfg->algorithmtype; inode->z_algorithmtype[1 ] =0 ; ictx->data_unaligned = erofs_sb_has_48bit(sbi) &&
@@ -1809,7 +1817,7 @@ void *erofs_begin_compressed_file(struct erofs_inode *inode, int fd, u64 fpos)if (cfg.c_fragments && !cfg.c_dedupe && !ictx->data_unaligned) inode->z_advise |=Z_EROFS_ADVISE_INTERLACED_PCLUSTER ; -if (cfg.c_fragments && !erofs_is_packed_inode (inode)) { +if (frag) { ictx->tofh =z_erofs_fragments_tofh (inode, fd, fpos);if (ictx == &g_ictx && cfg.c_fragdedupe !=FRAGDEDUPE_OFF ) {/*
@@ -2107,6 +2115,12 @@ int z_erofs_compress_init(struct erofs_sb_info *sbi, struct erofs_buffer_head *sreturn -EINVAL ; } +if (cfg.c_mkfs_pclustersize_metabox > (s32 )cfg.c_mkfs_pclustersize_max) { +erofs_err ("invalid pclustersize for the metabox file %u" , + cfg.c_mkfs_pclustersize_metabox); +return -EINVAL ; + } +if (sb_bh &&erofs_sb_has_compr_cfgs (sbi)) { ret =z_erofs_build_compr_cfgs (sbi, sb_bh, max_dict_size);if (ret)
lib/config.c +1 -0
@@ -36,6 +36,7 @@ void erofs_init_configure(void) cfg.c_uid =-1 ; cfg.c_gid =-1 ; cfg.c_max_decompressed_extent_bytes =-1 ; + cfg.c_mkfs_pclustersize_metabox =-1 ; erofs_stdout_tty =isatty (STDOUT_FILENO ); }
lib/inode.c +86 -43
278 lines not on this page · raw message
lib/liberofs_metabox.h new file +20 -0
@@ -0,0 +1,20 @@ +/* SPDX-License-Identifier: GPL-2.0+ OR Apache-2.0 */ +#ifndef __EROFS_LIB_LIBEROFS_METABOX_H +#define __EROFS_LIB_LIBEROFS_METABOX_H + +#include "erofs/internal.h" + +extern const char *erofs_metabox_identifier; +#define EROFS_METABOX_INODE erofs_metabox_identifier + +static inline bool erofs_is_metabox_inode (struct erofs_inode *inode) +{ +return inode->i_srcpath ==EROFS_METABOX_INODE ; +} + +void erofs_metabox_exit (struct erofs_sb_info *sbi); +int erofs_metabox_init (struct erofs_sb_info *sbi); +struct erofs_bufmgr *erofs_metabox_bmgr (struct erofs_sb_info *sbi); +int erofs_metabox_iflush (struct erofs_sb_info *sbi); + +#endif
lib/metabox.c new file +78 -0
78 lines not on this page · raw message
lib/rebuild.c +1 -1
@@ -409,7 +409,7 @@ static int erofs_rebuild_dirent_iter(struct erofs_dir_context *ctx)/* reset sbi, nid after subdirs are all loaded for the final dump */ inode->sbi = &g_sbi; - inode->nid =0 ; + inode->nid =EROFS_NID_UNALLOCATED ; out:free (path);return ret;
mkfs/main.c +59 -6
144 lines not on this page · raw message
Signature · 1 line
2.43.5