erofs: do not build pcpubuf.c for uncompressed data
Yue Hu
reviewerPATCH 1/1 erofs: do not build pcpubuf.c for uncompressed data
From: Yue Hu <[email protected]>
The function of pcpubuf.c is just for low-latency decompression algorithms (e.g. lz4).
Signed-off-by Yue Hu <[email protected]>
--- fs/erofs/Makefile | 4 ++-- fs/erofs/internal.h | 12 +++++++----- 2 files changed, 9 insertions(+), 7 deletions(-)
fs/erofs/Makefile +2 -2
@@ -1,8 +1,8 @@ # 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 -5
@@ -472,11 +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);
@@ -512,6 +507,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 +529,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
Signature · 1 line
2.17.1
Quoted 6 lines · Yue Hu
From: Yue Hu <[email protected]>
The function of
pcpubuf.cis just for low-latency decompression algorithms (e.g. lz4).Signed-off-by Yue Hu <[email protected]>
Subject: erofs: avoid pcpubuf.c inclusion if CONFIG_EROFS_FS_ZIP is off
Otherwise it looks good to me,
Reviewed-by Gao Xiang <[email protected]>
Thanks,
Gao Xiang
Quoted 57 lines
--- fs/erofs/Makefile | 4 ++-- fs/erofs/internal.h | 12 +++++++----- 2 files changed, 9 insertions(+), 7 deletions(-)fs/erofs/Makefile +2
-2@@ -1,8 +1,8 @@ # 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.ofs/erofs/internal.h +7
-5@@ -472,11 +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);@@ -512,6 +507,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 +529,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