From: Hu Weiwen <seh...@mail.scut.edu.cn> `end` arguement is completely broken now. Also, it could be readded later if needed.
Signed-off-by: Hu Weiwen <seh...@mail.scut.edu.cn> Signed-off-by: Gao Xiang <hsiang...@aol.com> --- Hi Weiwen, Sorry for late update. I've cleaned up the patchset (mainly [PATCH 2/2], could you kindly recheck it on your side if it works, and help me update the commit message of [PATCH 2/2] as well? Thanks, Gao Xiang include/erofs/cache.h | 2 +- lib/cache.c | 6 ++---- lib/compress.c | 2 +- lib/inode.c | 10 +++++----- lib/xattr.c | 2 +- mkfs/main.c | 2 +- 6 files changed, 11 insertions(+), 13 deletions(-) diff --git a/include/erofs/cache.h b/include/erofs/cache.h index 8c171f5a130e..f8dff67b9736 100644 --- a/include/erofs/cache.h +++ b/include/erofs/cache.h @@ -95,7 +95,7 @@ struct erofs_buffer_head *erofs_balloc(int type, erofs_off_t size, struct erofs_buffer_head *erofs_battach(struct erofs_buffer_head *bh, int type, unsigned int size); -erofs_blk_t erofs_mapbh(struct erofs_buffer_block *bb, bool end); +erofs_blk_t erofs_mapbh(struct erofs_buffer_block *bb); bool erofs_bflush(struct erofs_buffer_block *bb); void erofs_bdrop(struct erofs_buffer_head *bh, bool tryrevoke); diff --git a/lib/cache.c b/lib/cache.c index 0d5c4a5d48de..32a58311f563 100644 --- a/lib/cache.c +++ b/lib/cache.c @@ -257,16 +257,14 @@ static erofs_blk_t __erofs_mapbh(struct erofs_buffer_block *bb) return blkaddr; } -erofs_blk_t erofs_mapbh(struct erofs_buffer_block *bb, bool end) +erofs_blk_t erofs_mapbh(struct erofs_buffer_block *bb) { struct erofs_buffer_block *t, *nt; if (!bb || bb->blkaddr == NULL_ADDR) { list_for_each_entry_safe(t, nt, &blkh.list, list) { - if (!end && (t == bb || nt == &blkh)) - break; (void)__erofs_mapbh(t); - if (end && t == bb) + if (t == bb) break; } } diff --git a/lib/compress.c b/lib/compress.c index 86db940b6edd..2b1f93c389ff 100644 --- a/lib/compress.c +++ b/lib/compress.c @@ -416,7 +416,7 @@ int erofs_write_compressed_file(struct erofs_inode *inode) memset(compressmeta, 0, Z_EROFS_LEGACY_MAP_HEADER_SIZE); - blkaddr = erofs_mapbh(bh->block, true); /* start_blkaddr */ + blkaddr = erofs_mapbh(bh->block); /* start_blkaddr */ ctx.blkaddr = blkaddr; ctx.metacur = compressmeta + Z_EROFS_LEGACY_MAP_HEADER_SIZE; ctx.head = ctx.tail = 0; diff --git a/lib/inode.c b/lib/inode.c index d0b4d51f3e3d..4ed6aed25243 100644 --- a/lib/inode.c +++ b/lib/inode.c @@ -148,7 +148,7 @@ static int __allocate_inode_bh_data(struct erofs_inode *inode, inode->bh_data = bh; /* get blkaddr of the bh */ - ret = erofs_mapbh(bh->block, true); + ret = erofs_mapbh(bh->block); DBG_BUGON(ret < 0); /* write blocks except for the tail-end block */ @@ -522,7 +522,7 @@ int erofs_prepare_tail_block(struct erofs_inode *inode) bh->op = &erofs_skip_write_bhops; /* get blkaddr of bh */ - ret = erofs_mapbh(bh->block, true); + ret = erofs_mapbh(bh->block); DBG_BUGON(ret < 0); inode->u.i_blkaddr = bh->block->blkaddr; @@ -632,7 +632,7 @@ int erofs_write_tail_end(struct erofs_inode *inode) int ret; erofs_off_t pos; - erofs_mapbh(bh->block, true); + erofs_mapbh(bh->block); pos = erofs_btell(bh, true) - EROFS_BLKSIZ; ret = dev_write(inode->idata, pos, inode->idata_size); if (ret) @@ -879,7 +879,7 @@ void erofs_fixup_meta_blkaddr(struct erofs_inode *rootdir) struct erofs_buffer_head *const bh = rootdir->bh; erofs_off_t off, meta_offset; - erofs_mapbh(bh->block, true); + erofs_mapbh(bh->block); off = erofs_btell(bh, false); if (off > rootnid_maxoffset) @@ -898,7 +898,7 @@ erofs_nid_t erofs_lookupnid(struct erofs_inode *inode) if (!bh) return inode->nid; - erofs_mapbh(bh->block, true); + erofs_mapbh(bh->block); off = erofs_btell(bh, false); meta_offset = blknr_to_addr(sbi.meta_blkaddr); diff --git a/lib/xattr.c b/lib/xattr.c index 49ebb9c2f539..8b7bcb126fe9 100644 --- a/lib/xattr.c +++ b/lib/xattr.c @@ -575,7 +575,7 @@ int erofs_build_shared_xattrs_from_path(const char *path) } bh->op = &erofs_skip_write_bhops; - erofs_mapbh(bh->block, true); + erofs_mapbh(bh->block); off = erofs_btell(bh, false); sbi.xattr_blkaddr = off / EROFS_BLKSIZ; diff --git a/mkfs/main.c b/mkfs/main.c index abd48be0fa4f..d9c4c7fff5c1 100644 --- a/mkfs/main.c +++ b/mkfs/main.c @@ -304,7 +304,7 @@ int erofs_mkfs_update_super_block(struct erofs_buffer_head *bh, round_up(EROFS_SUPER_END, EROFS_BLKSIZ); char *buf; - *blocks = erofs_mapbh(NULL, true); + *blocks = erofs_mapbh(NULL); sb.blocks = cpu_to_le32(*blocks); sb.root_nid = cpu_to_le16(root_nid); memcpy(sb.uuid, sbi.uuid, sizeof(sb.uuid)); -- 2.24.0