Commit 706fd68f authored by Gao Xiang's avatar Gao Xiang
Browse files

erofs: refine managed cache operations to folios 



Convert erofs_try_to_free_all_cached_pages() and
z_erofs_cache_release_folio().

Besides, erofs_page_is_managed() is moved to zdata.c and renamed
as erofs_folio_is_managed().

Reviewed-by: default avatarChao Yu <chao@kernel.org>
Signed-off-by: default avatarGao Xiang <hsiangkao@linux.alibaba.com>
Link: https://lore.kernel.org/r/20240305091448.1384242-6-hsiangkao@linux.alibaba.com
parent 9266f2dc

fs/erofs/compress.h

+0 −7
Original line number Diff line number Diff line
@@ -81,13 +81,6 @@ static inline bool z_erofs_put_shortlivedpage(struct page **pagepool, 
	return true;

}



#define MNGD_MAPPING(sbi)	((sbi)->managed_cache->i_mapping)

static inline bool erofs_page_is_managed(const struct erofs_sb_info *sbi,

					 struct page *page)

{

	return page->mapping == MNGD_MAPPING(sbi);

}



int z_erofs_fixup_insize(struct z_erofs_decompress_req *rq, const char *padbuf,

			 unsigned int padbufsize);

extern const struct z_erofs_decompressor erofs_decompressors[];

fs/erofs/decompressor_deflate.c

+0 −3
Original line number Diff line number Diff line
@@ -212,9 +212,6 @@ int z_erofs_deflate_decompress(struct z_erofs_decompress_req *rq, 


			if (rq->out[no] != rq->in[j])

				continue;



			DBG_BUGON(erofs_page_is_managed(EROFS_SB(sb),

							rq->in[j]));

			tmppage = erofs_allocpage(pgpl, rq->gfp);

			if (!tmppage) {

				err = -ENOMEM;

fs/erofs/decompressor_lzma.c

+0 −3
Original line number Diff line number Diff line
@@ -258,9 +258,6 @@ int z_erofs_lzma_decompress(struct z_erofs_decompress_req *rq, 


			if (rq->out[no] != rq->in[j])

				continue;



			DBG_BUGON(erofs_page_is_managed(EROFS_SB(rq->sb),

							rq->in[j]));

			tmppage = erofs_allocpage(pgpl, rq->gfp);

			if (!tmppage) {

				err = -ENOMEM;

fs/erofs/internal.h

+2 −2
Original line number Diff line number Diff line
@@ -467,7 +467,7 @@ int __init erofs_init_shrinker(void); 
void erofs_exit_shrinker(void);

int __init z_erofs_init_zip_subsystem(void);

void z_erofs_exit_zip_subsystem(void);

int erofs_try_to_free_all_cached_pages(struct erofs_sb_info *sbi,

int erofs_try_to_free_all_cached_folios(struct erofs_sb_info *sbi,

					struct erofs_workgroup *egrp);

int z_erofs_map_blocks_iter(struct inode *inode, struct erofs_map_blocks *map,

			    int flags);

fs/erofs/utils.c

+1 −1
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ static bool erofs_try_to_release_workgroup(struct erofs_sb_info *sbi, 
	 * the XArray. Otherwise some cached pages could be still attached to

	 * the orphan old workgroup when the new one is available in the tree.

	 */

	if (erofs_try_to_free_all_cached_pages(sbi, grp))

	if (erofs_try_to_free_all_cached_folios(sbi, grp))

		goto out;



	/*