Commit 285d0f85 authored by Yue Hu's avatar Yue Hu Committed by Gao Xiang
Browse files

erofs: avoid pcpubuf.c inclusion if CONFIG_EROFS_FS_ZIP is off 



The function of pcpubuf.c is just for low-latency decompression
algorithms (e.g. lz4).

Signed-off-by: default avatarYue Hu <huyue2@coolpad.com>
Reviewed-by: default avatarGao Xiang <hsiangkao@linux.alibaba.com>
Reviewed-by: default avatarChao Yu <chao@kernel.org>
Link: https://lore.kernel.org/r/20230515095758.10391-1-zbestahu@gmail.com


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

fs/erofs/Makefile

+2 −2
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only



obj-$(CONFIG_EROFS_FS) += erofs.o

erofs-objs := super.o inode.o data.o namei.o dir.o utils.o pcpubuf.o sysfs.o

erofs-objs := super.o inode.o data.o namei.o dir.o utils.o sysfs.o

erofs-$(CONFIG_EROFS_FS_XATTR) += xattr.o

erofs-$(CONFIG_EROFS_FS_ZIP) += decompressor.o zmap.o zdata.o

erofs-$(CONFIG_EROFS_FS_ZIP) += decompressor.o zmap.o zdata.o pcpubuf.o

erofs-$(CONFIG_EROFS_FS_ZIP_LZMA) += decompressor_lzma.o

erofs-$(CONFIG_EROFS_FS_ONDEMAND) += fscache.o

fs/erofs/internal.h

+7 −6
Original line number Diff line number Diff line
@@ -472,12 +472,6 @@ static inline void *erofs_vm_map_ram(struct page **pages, unsigned int count) 
	return NULL;

}



void *erofs_get_pcpubuf(unsigned int requiredpages);

void erofs_put_pcpubuf(void *ptr);

int erofs_pcpubuf_growsize(unsigned int nrpages);

void __init erofs_pcpubuf_init(void);

void erofs_pcpubuf_exit(void);



int erofs_register_sysfs(struct super_block *sb);

void erofs_unregister_sysfs(struct super_block *sb);

int __init erofs_init_sysfs(void);
@@ -512,6 +506,11 @@ int z_erofs_load_lz4_config(struct super_block *sb, 
			    struct z_erofs_lz4_cfgs *lz4, int len);

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

			    int flags);

void *erofs_get_pcpubuf(unsigned int requiredpages);

void erofs_put_pcpubuf(void *ptr);

int erofs_pcpubuf_growsize(unsigned int nrpages);

void __init erofs_pcpubuf_init(void);

void erofs_pcpubuf_exit(void);

#else

static inline void erofs_shrinker_register(struct super_block *sb) {}

static inline void erofs_shrinker_unregister(struct super_block *sb) {}
@@ -529,6 +528,8 @@ static inline int z_erofs_load_lz4_config(struct super_block *sb, 
	}

	return 0;

}

static inline void erofs_pcpubuf_init(void) {}

static inline void erofs_pcpubuf_exit(void) {}

#endif	/* !CONFIG_EROFS_FS_ZIP */



#ifdef CONFIG_EROFS_FS_ZIP_LZMA