Commit eb2c5e41 authored by Gao Xiang's avatar Gao Xiang
Browse files

erofs: keep meta inode into erofs_buf 



So that erofs_read_metadata() can read metadata from other inodes
(e.g. packed inode) as well.

Signed-off-by: default avatarJingbo Xu <jefflexu@linux.alibaba.com>
Acked-by: default avatarChao Yu <chao@kernel.org>
Link: https://lore.kernel.org/r/20230407141710.113882-2-jefflexu@linux.alibaba.com


Signed-off-by: default avatarGao Xiang <hsiangkao@linux.alibaba.com>
parent cb9bce79

fs/erofs/data.c

+14 −9
Original line number Diff line number Diff line
@@ -31,11 +31,11 @@ void erofs_put_metabuf(struct erofs_buf *buf) 
 * Derive the block size from inode->i_blkbits to make compatible with

 * anonymous inode in fscache mode.

 */

void *erofs_bread(struct erofs_buf *buf, struct inode *inode,

		  erofs_blk_t blkaddr, enum erofs_kmap_type type)

void *erofs_bread(struct erofs_buf *buf, erofs_blk_t blkaddr,

		  enum erofs_kmap_type type)

{

	struct inode *inode = buf->inode;

	erofs_off_t offset = (erofs_off_t)blkaddr << inode->i_blkbits;

	struct address_space *const mapping = inode->i_mapping;

	pgoff_t index = offset >> PAGE_SHIFT;

	struct page *page = buf->page;

	struct folio *folio;
@@ -45,7 +45,7 @@ void *erofs_bread(struct erofs_buf *buf, struct inode *inode, 
		erofs_put_metabuf(buf);



		nofs_flag = memalloc_nofs_save();

		folio = read_cache_folio(mapping, index, NULL, NULL);

		folio = read_cache_folio(inode->i_mapping, index, NULL, NULL);

		memalloc_nofs_restore(nofs_flag);

		if (IS_ERR(folio))

			return folio;
@@ -67,14 +67,19 @@ void *erofs_bread(struct erofs_buf *buf, struct inode *inode, 
	return buf->base + (offset & ~PAGE_MASK);

}



void *erofs_read_metabuf(struct erofs_buf *buf, struct super_block *sb,

			 erofs_blk_t blkaddr, enum erofs_kmap_type type)

void erofs_init_metabuf(struct erofs_buf *buf, struct super_block *sb)

{

	if (erofs_is_fscache_mode(sb))

		return erofs_bread(buf, EROFS_SB(sb)->s_fscache->inode,

				   blkaddr, type);

		buf->inode = EROFS_SB(sb)->s_fscache->inode;

	else

		buf->inode = sb->s_bdev->bd_inode;

}



	return erofs_bread(buf, sb->s_bdev->bd_inode, blkaddr, type);

void *erofs_read_metabuf(struct erofs_buf *buf, struct super_block *sb,

			 erofs_blk_t blkaddr, enum erofs_kmap_type type)

{

	erofs_init_metabuf(buf, sb);

	return erofs_bread(buf, blkaddr, type);

}



static int erofs_map_blocks_flatmode(struct inode *inode,

fs/erofs/dir.c

+2 −1
Original line number Diff line number Diff line
@@ -58,11 +58,12 @@ static int erofs_readdir(struct file *f, struct dir_context *ctx) 
	int err = 0;

	bool initial = true;



	buf.inode = dir;

	while (ctx->pos < dirsize) {

		struct erofs_dirent *de;

		unsigned int nameoff, maxsize;



		de = erofs_bread(&buf, dir, i, EROFS_KMAP);

		de = erofs_bread(&buf, i, EROFS_KMAP);

		if (IS_ERR(de)) {

			erofs_err(sb, "fail to readdir of logical block %u of nid %llu",

				  i, EROFS_I(dir)->nid);

fs/erofs/internal.h

+4 −2
Original line number Diff line number Diff line
@@ -248,6 +248,7 @@ enum erofs_kmap_type { 
};



struct erofs_buf {

	struct inode *inode;

	struct page *page;

	void *base;

	enum erofs_kmap_type kmap_type;
@@ -441,8 +442,9 @@ extern const struct iomap_ops z_erofs_iomap_report_ops; 


void erofs_unmap_metabuf(struct erofs_buf *buf);

void erofs_put_metabuf(struct erofs_buf *buf);

void *erofs_bread(struct erofs_buf *buf, struct inode *inode,

		  erofs_blk_t blkaddr, enum erofs_kmap_type type);

void *erofs_bread(struct erofs_buf *buf, erofs_blk_t blkaddr,

		  enum erofs_kmap_type type);

void erofs_init_metabuf(struct erofs_buf *buf, struct super_block *sb);

void *erofs_read_metabuf(struct erofs_buf *buf, struct super_block *sb,

			 erofs_blk_t blkaddr, enum erofs_kmap_type type);

int erofs_map_dev(struct super_block *sb, struct erofs_map_dev *dev);

fs/erofs/namei.c

+3 −1
Original line number Diff line number Diff line
@@ -99,7 +99,8 @@ static void *erofs_find_target_block(struct erofs_buf *target, 
		struct erofs_buf buf = __EROFS_BUF_INITIALIZER;

		struct erofs_dirent *de;



		de = erofs_bread(&buf, dir, mid, EROFS_KMAP);

		buf.inode = dir;

		de = erofs_bread(&buf, mid, EROFS_KMAP);

		if (!IS_ERR(de)) {

			const int nameoff = nameoff_from_disk(de->nameoff, bsz);

			const int ndirents = nameoff / sizeof(*de);
@@ -170,6 +171,7 @@ int erofs_namei(struct inode *dir, const struct qstr *name, erofs_nid_t *nid, 


	qn.name = name->name;

	qn.end = name->name + name->len;

	buf.inode = dir;



	ndirents = 0;

	de = erofs_find_target_block(&buf, dir, &qn, &ndirents);

fs/erofs/super.c

+3 −3
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ static void *erofs_read_metadata(struct super_block *sb, struct erofs_buf *buf, 
	int len, i, cnt;



	*offset = round_up(*offset, 4);

	ptr = erofs_read_metabuf(buf, sb, erofs_blknr(sb, *offset), EROFS_KMAP);

	ptr = erofs_bread(buf, erofs_blknr(sb, *offset), EROFS_KMAP);

	if (IS_ERR(ptr))

		return ptr;
@@ -151,8 +151,7 @@ static void *erofs_read_metadata(struct super_block *sb, struct erofs_buf *buf, 
	for (i = 0; i < len; i += cnt) {

		cnt = min_t(int, sb->s_blocksize - erofs_blkoff(sb, *offset),

			    len - i);

		ptr = erofs_read_metabuf(buf, sb, erofs_blknr(sb, *offset),

					 EROFS_KMAP);

		ptr = erofs_bread(buf, erofs_blknr(sb, *offset), EROFS_KMAP);

		if (IS_ERR(ptr)) {

			kfree(buffer);

			return ptr;
@@ -179,6 +178,7 @@ static int erofs_load_compr_cfgs(struct super_block *sb, 
		return -EINVAL;

	}



	erofs_init_metabuf(&buf, sb);

	offset = EROFS_SUPER_OFFSET + sbi->sb_size;

	alg = 0;

	for (algs = sbi->available_compr_algs; algs; algs >>= 1, ++alg) {