Commit 706e50e4 authored by Bo Liu's avatar Bo Liu Committed by Gao Xiang
Browse files

erofs: get rid of erofs_kmap_type 



Since EROFS_KMAP_ATOMIC is no longer valid, get rid of erofs_kmap_type too.

Signed-off-by: default avatarBo Liu <liubo03@inspur.com>
Reviewed-by: default avatarGao Xiang <hsiangkao@linux.alibaba.com>
Reviewed-by: default avatarChao Yu <chao@kernel.org>
Link: https://lore.kernel.org/r/20250217093141.2659-1-liubo03@inspur.com


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

fs/erofs/data.c

+8 −9
Original line number Diff line number Diff line
@@ -25,8 +25,7 @@ void erofs_put_metabuf(struct erofs_buf *buf) 
	buf->page = NULL;

}



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

		  enum erofs_kmap_type type)

void *erofs_bread(struct erofs_buf *buf, erofs_off_t offset, bool need_kmap)

{

	pgoff_t index = offset >> PAGE_SHIFT;

	struct folio *folio = NULL;
@@ -43,10 +42,10 @@ void *erofs_bread(struct erofs_buf *buf, erofs_off_t offset, 
			return folio;

	}

	buf->page = folio_file_page(folio, index);

	if (!buf->base && type == EROFS_KMAP)

		buf->base = kmap_local_page(buf->page);

	if (type == EROFS_NO_KMAP)

	if (!need_kmap)

		return NULL;

	if (!buf->base)

		buf->base = kmap_local_page(buf->page);

	return buf->base + (offset & ~PAGE_MASK);

}
@@ -65,10 +64,10 @@ 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_off_t offset, enum erofs_kmap_type type)

			 erofs_off_t offset, bool need_kmap)

{

	erofs_init_metabuf(buf, sb);

	return erofs_bread(buf, offset, type);

	return erofs_bread(buf, offset, need_kmap);

}



static int erofs_map_blocks_flatmode(struct inode *inode,
@@ -135,7 +134,7 @@ int erofs_map_blocks(struct inode *inode, struct erofs_map_blocks *map) 
	pos = ALIGN(erofs_iloc(inode) + vi->inode_isize +

		    vi->xattr_isize, unit) + unit * chunknr;



	kaddr = erofs_read_metabuf(&buf, sb, pos, EROFS_KMAP);

	kaddr = erofs_read_metabuf(&buf, sb, pos, true);

	if (IS_ERR(kaddr)) {

		err = PTR_ERR(kaddr);

		goto out;
@@ -312,7 +311,7 @@ static int erofs_iomap_begin(struct inode *inode, loff_t offset, loff_t length, 
		struct erofs_buf buf = __EROFS_BUF_INITIALIZER;



		iomap->type = IOMAP_INLINE;

		ptr = erofs_read_metabuf(&buf, sb, mdev.m_pa, EROFS_KMAP);

		ptr = erofs_read_metabuf(&buf, sb, mdev.m_pa, true);

		if (IS_ERR(ptr))

			return PTR_ERR(ptr);

		iomap->inline_data = ptr;

fs/erofs/dir.c

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ static int erofs_readdir(struct file *f, struct dir_context *ctx) 
		struct erofs_dirent *de;

		unsigned int nameoff, maxsize;



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

		de = erofs_bread(&buf, dbstart, true);

		if (IS_ERR(de)) {

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

				  erofs_blknr(sb, dbstart), EROFS_I(dir)->nid);

fs/erofs/fileio.c

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ static int erofs_fileio_scan_folio(struct erofs_fileio *io, struct folio *folio) 
			void *src;



			src = erofs_read_metabuf(&buf, inode->i_sb,

						 map->m_pa + ofs, EROFS_KMAP);

						 map->m_pa + ofs, true);

			if (IS_ERR(src)) {

				err = PTR_ERR(src);

				break;

fs/erofs/fscache.c

+1 −1
Original line number Diff line number Diff line
@@ -276,7 +276,7 @@ static int erofs_fscache_data_read_slice(struct erofs_fscache_rq *req) 
		size_t size = map.m_llen;

		void *src;



		src = erofs_read_metabuf(&buf, sb, map.m_pa, EROFS_KMAP);

		src = erofs_read_metabuf(&buf, sb, map.m_pa, true);

		if (IS_ERR(src))

			return PTR_ERR(src);

fs/erofs/inode.c

+3 −3
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ static int erofs_read_inode(struct inode *inode) 
	blkaddr = erofs_blknr(sb, inode_loc);

	ofs = erofs_blkoff(sb, inode_loc);



	kaddr = erofs_read_metabuf(&buf, sb, erofs_pos(sb, blkaddr), EROFS_KMAP);

	kaddr = erofs_read_metabuf(&buf, sb, erofs_pos(sb, blkaddr), true);

	if (IS_ERR(kaddr)) {

		erofs_err(sb, "failed to get inode (nid: %llu) page, err %ld",

			  vi->nid, PTR_ERR(kaddr));
@@ -82,8 +82,8 @@ static int erofs_read_inode(struct inode *inode) 
				goto err_out;

			}

			memcpy(copied, dic, gotten);

			kaddr = erofs_read_metabuf(&buf, sb, erofs_pos(sb, blkaddr + 1),

						   EROFS_KMAP);

			kaddr = erofs_read_metabuf(&buf, sb,

					erofs_pos(sb, blkaddr + 1), true);

			if (IS_ERR(kaddr)) {

				erofs_err(sb, "failed to get inode payload block (nid: %llu), err %ld",

					  vi->nid, PTR_ERR(kaddr));