iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

erofs: rename utils.c to zutil.c

Browse Source 
Currently, utils.c is only useful if CONFIG_EROFS_FS_ZIP is on.
So let's rename it to zutil.c as well as avoid its inclusion if
CONFIG_EROFS_FS_ZIP is explicitly disabled.

Signed-off-by: Chunhai Guo <guochunhai@vivo.com>
Reviewed-by: Gao Xiang <hsiangkao@linux.alibaba.com>
Link: https://lore.kernel.org/r/20240401135550.2550043-1-guochunhai@vivo.com
Signed-off-by: Gao Xiang <hsiangkao@linux.alibaba.com>
This commit is contained in:
Chunhai Guo 2024-04-01 07:55:50 -06:00 committed by Gao Xiang
parent dd5a440a31
commit cacd5b04e2
2 changed files with 13 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs/erofs/Makefile
View File

@ -1,9 +1,9 @@
# SPDX-License-Identifier: GPL-2.0-only # SPDX-License-Identifier: GPL-2.0-only
obj-$(CONFIG_EROFS_FS) += erofs.o obj-$(CONFIG_EROFS_FS) += erofs.o
erofs-objs := super.o inode.o data.o namei.o dir.o utils.o sysfs.o erofs-objs := super.o inode.o data.o namei.o dir.o sysfs.o
erofs-$(CONFIG_EROFS_FS_XATTR) += xattr.o erofs-$(CONFIG_EROFS_FS_XATTR) += xattr.o
erofs-$(CONFIG_EROFS_FS_ZIP) += decompressor.o zmap.o zdata.o pcpubuf.o erofs-$(CONFIG_EROFS_FS_ZIP) += decompressor.o zmap.o zdata.o pcpubuf.o zutil.o
erofs-$(CONFIG_EROFS_FS_ZIP_LZMA) += decompressor_lzma.o erofs-$(CONFIG_EROFS_FS_ZIP_LZMA) += decompressor_lzma.o
erofs-$(CONFIG_EROFS_FS_ZIP_DEFLATE) += decompressor_deflate.o erofs-$(CONFIG_EROFS_FS_ZIP_DEFLATE) += decompressor_deflate.o
erofs-$(CONFIG_EROFS_FS_ONDEMAND) += fscache.o erofs-$(CONFIG_EROFS_FS_ONDEMAND) += fscache.o

30
fs/erofs/utils.c → fs/erofs/zutil.c
View File

@ -5,6 +5,15 @@
*/ */
#include "internal.h" #include "internal.h"
static atomic_long_t erofs_global_shrink_cnt; /* for all mounted instances */
/* protected by 'erofs_sb_list_lock' */
static unsigned int shrinker_run_no;
/* protects the mounted 'erofs_sb_list' */
static DEFINE_SPINLOCK(erofs_sb_list_lock);
static LIST_HEAD(erofs_sb_list);
static struct shrinker *erofs_shrinker_info;
struct page *erofs_allocpage(struct page **pagepool, gfp_t gfp) struct page *erofs_allocpage(struct page **pagepool, gfp_t gfp)
{ {
struct page *page = *pagepool; struct page *page = *pagepool;
@ -12,10 +21,9 @@ struct page *erofs_allocpage(struct page **pagepool, gfp_t gfp)
if (page) { if (page) {
DBG_BUGON(page_ref_count(page) != 1); DBG_BUGON(page_ref_count(page) != 1);
*pagepool = (struct page *)page_private(page); *pagepool = (struct page *)page_private(page);
} else { return page;
page = alloc_page(gfp);
} }
return page; return alloc_page(gfp);
} }
void erofs_release_pages(struct page **pagepool) void erofs_release_pages(struct page **pagepool)
@ -28,10 +36,6 @@ void erofs_release_pages(struct page **pagepool)
} }
} }
#ifdef CONFIG_EROFS_FS_ZIP
/* global shrink count (for all mounted EROFS instances) */
static atomic_long_t erofs_global_shrink_cnt;
static bool erofs_workgroup_get(struct erofs_workgroup *grp) static bool erofs_workgroup_get(struct erofs_workgroup *grp)
{ {
if (lockref_get_not_zero(&grp->lockref)) if (lockref_get_not_zero(&grp->lockref))
@ -171,13 +175,6 @@ static unsigned long erofs_shrink_workstation(struct erofs_sb_info *sbi,
return freed; return freed;
} }
/* protected by 'erofs_sb_list_lock' */
static unsigned int shrinker_run_no;
/* protects the mounted 'erofs_sb_list' */
static DEFINE_SPINLOCK(erofs_sb_list_lock);
static LIST_HEAD(erofs_sb_list);
void erofs_shrinker_register(struct super_block *sb) void erofs_shrinker_register(struct super_block *sb)
{ {
struct erofs_sb_info *sbi = EROFS_SB(sb); struct erofs_sb_info *sbi = EROFS_SB(sb);
@ -264,8 +261,6 @@ static unsigned long erofs_shrink_scan(struct shrinker *shrink,
return freed; return freed;
} }
static struct shrinker *erofs_shrinker_info;
int __init erofs_init_shrinker(void) int __init erofs_init_shrinker(void)
{ {
erofs_shrinker_info = shrinker_alloc(0, "erofs-shrinker"); erofs_shrinker_info = shrinker_alloc(0, "erofs-shrinker");
@ -274,9 +269,7 @@ int __init erofs_init_shrinker(void)
erofs_shrinker_info->count_objects = erofs_shrink_count; erofs_shrinker_info->count_objects = erofs_shrink_count;
erofs_shrinker_info->scan_objects = erofs_shrink_scan; erofs_shrinker_info->scan_objects = erofs_shrink_scan;
shrinker_register(erofs_shrinker_info); shrinker_register(erofs_shrinker_info);
return 0; return 0;
} }
@ -284,4 +277,3 @@ void erofs_exit_shrinker(void)
{ {
shrinker_free(erofs_shrinker_info); shrinker_free(erofs_shrinker_info);
} }
#endif /* !CONFIG_EROFS_FS_ZIP */