Commit 20c02972 authored by Gao Xiang's avatar Gao Xiang
Browse files

Merge branch 'misc.erofs' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git 

Al Viro has a series of "->bd_inode elimination" which touches several
subsystems, but he also has EROFS-specific further cleanup patches
which I tend to go with EROFS tree for more testing.

Let's merge "#misc.erofs" as Al suggested in the previous email [1]:

"#misc.erofs (the first two commits) is put into never-rebased mode;
 you pull it into your tree and do whatever's convenient with the rest.
 I merge the same branch into block_device work; that way it doesn't
 cause conflicts whatever else happens in our trees."

[1] https://lore.kernel.org/r/20240503041542.GV2118490@ZenIV



Signed-off-by: default avatarGao Xiang <xiang@kernel.org>
parents 7c35de4d 958b9f85

fs/erofs/data.c

+5 −7
Original line number Diff line number Diff line
@@ -29,11 +29,9 @@ 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, erofs_blk_t blkaddr,

void *erofs_bread(struct erofs_buf *buf, erofs_off_t offset,

		  enum erofs_kmap_type type)

{

	struct inode *inode = buf->inode;

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

	pgoff_t index = offset >> PAGE_SHIFT;

	struct page *page = buf->page;

	struct folio *folio;
@@ -43,7 +41,7 @@ void *erofs_bread(struct erofs_buf *buf, erofs_blk_t blkaddr, 
		erofs_put_metabuf(buf);



		nofs_flag = memalloc_nofs_save();

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

		folio = read_cache_folio(buf->mapping, index, NULL, NULL);

		memalloc_nofs_restore(nofs_flag);

		if (IS_ERR(folio))

			return folio;
@@ -68,16 +66,16 @@ void *erofs_bread(struct erofs_buf *buf, erofs_blk_t blkaddr, 
void erofs_init_metabuf(struct erofs_buf *buf, struct super_block *sb)

{

	if (erofs_is_fscache_mode(sb))

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

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

	else

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

		buf->mapping = sb->s_bdev->bd_inode->i_mapping;

}



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);

	return erofs_bread(buf, erofs_pos(sb, blkaddr), type);

}



static int erofs_map_blocks_flatmode(struct inode *inode,

fs/erofs/dir.c

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

	bool initial = true;



	buf.inode = dir;

	buf.mapping = dir->i_mapping;

	while (ctx->pos < dirsize) {

		struct erofs_dirent *de;

		unsigned int nameoff, maxsize;



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

		de = erofs_bread(&buf, erofs_pos(sb, 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

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



struct erofs_buf {

	struct inode *inode;

	struct address_space *mapping;

	struct page *page;

	void *base;

	enum erofs_kmap_type kmap_type;
@@ -402,7 +402,7 @@ void *erofs_read_metadata(struct super_block *sb, struct erofs_buf *buf, 
			  erofs_off_t *offset, int *lengthp);

void erofs_unmap_metabuf(struct erofs_buf *buf);

void erofs_put_metabuf(struct erofs_buf *buf);

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

void *erofs_bread(struct erofs_buf *buf, erofs_off_t offset,

		  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,

fs/erofs/namei.c

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

		struct erofs_dirent *de;



		buf.inode = dir;

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

		buf.mapping = dir->i_mapping;

		de = erofs_bread(&buf, erofs_pos(dir->i_sb, mid), EROFS_KMAP);

		if (!IS_ERR(de)) {

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

			const int ndirents = nameoff / sizeof(*de);
@@ -171,7 +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;

	buf.mapping = dir->i_mapping;



	ndirents = 0;

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

fs/erofs/super.c

+4 −4
Original line number Diff line number Diff line
@@ -132,11 +132,11 @@ void *erofs_read_metadata(struct super_block *sb, struct erofs_buf *buf, 
	int len, i, cnt;



	*offset = round_up(*offset, 4);

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

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

	if (IS_ERR(ptr))

		return ptr;



	len = le16_to_cpu(*(__le16 *)&ptr[erofs_blkoff(sb, *offset)]);

	len = le16_to_cpu(*(__le16 *)ptr);

	if (!len)

		len = U16_MAX + 1;

	buffer = kmalloc(len, GFP_KERNEL);
@@ -148,12 +148,12 @@ 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_bread(buf, erofs_blknr(sb, *offset), EROFS_KMAP);

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

		if (IS_ERR(ptr)) {

			kfree(buffer);

			return ptr;

		}

		memcpy(buffer + i, ptr + erofs_blkoff(sb, *offset), cnt);

		memcpy(buffer + i, ptr, cnt);

		*offset += cnt;

	}

	return buffer;