leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Squashfs: Make ZLIB compression support optional

Browse Source 
Squashfs now supports XZ and LZO compression in addition to ZLIB.
As such it no longer makes sense to always include ZLIB support.
In particular embedded systems may only use LZO or XZ compression, and
the ability to exclude ZLIB support will reduce kernel size.

Signed-off-by: Phillip Lougher <phillip@squashfs.org.uk>
This commit is contained in:
Phillip Lougher 2011-07-22 03:01:28 +01:00
parent 812753d66f
commit cc6d349714
5 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
fs/squashfs/Kconfig
View File

@ -1,7 +1,6 @@
config SQUASHFS config SQUASHFS
tristate "SquashFS 4.0 - Squashed file system support" tristate "SquashFS 4.0 - Squashed file system support"
depends on BLOCK depends on BLOCK
select ZLIB_INFLATE
help help
Saying Y here includes support for SquashFS 4.0 (a Compressed Saying Y here includes support for SquashFS 4.0 (a Compressed
Read-Only File System). Squashfs is a highly compressed read-only Read-Only File System). Squashfs is a highly compressed read-only
@ -36,6 +35,19 @@ config SQUASHFS_XATTR
If unsure, say N. If unsure, say N.
config SQUASHFS_ZLIB
bool "Include support for ZLIB compressed file systems"
depends on SQUASHFS
select ZLIB_INFLATE
default y
help
ZLIB compression is the standard compression used by Squashfs
file systems. It offers a good trade-off between compression
achieved and the amount of CPU time and memory necessary to
compress and decompress.
If unsure, say Y.
config SQUASHFS_LZO config SQUASHFS_LZO
bool "Include support for LZO compressed file systems" bool "Include support for LZO compressed file systems"
depends on SQUASHFS depends on SQUASHFS

3
fs/squashfs/Makefile
View File

@ -4,7 +4,8 @@
obj-$(CONFIG_SQUASHFS) += squashfs.o obj-$(CONFIG_SQUASHFS) += squashfs.o
squashfs-y += block.o cache.o dir.o export.o file.o fragment.o id.o inode.o squashfs-y += block.o cache.o dir.o export.o file.o fragment.o id.o inode.o
squashfs-y += namei.o super.o symlink.o zlib_wrapper.o decompressor.o squashfs-y += namei.o super.o symlink.o decompressor.o
squashfs-$(CONFIG_SQUASHFS_XATTR) += xattr.o xattr_id.o squashfs-$(CONFIG_SQUASHFS_XATTR) += xattr.o xattr_id.o
squashfs-$(CONFIG_SQUASHFS_LZO) += lzo_wrapper.o squashfs-$(CONFIG_SQUASHFS_LZO) += lzo_wrapper.o
squashfs-$(CONFIG_SQUASHFS_XZ) += xz_wrapper.o squashfs-$(CONFIG_SQUASHFS_XZ) += xz_wrapper.o
squashfs-$(CONFIG_SQUASHFS_ZLIB) += zlib_wrapper.o

6
fs/squashfs/decompressor.c
View File

@ -52,6 +52,12 @@ static const struct squashfs_decompressor squashfs_xz_comp_ops = {
}; };
#endif #endif
#ifndef CONFIG_SQUASHFS_ZLIB
static const struct squashfs_decompressor squashfs_zlib_comp_ops = {
NULL, NULL, NULL, ZLIB_COMPRESSION, "zlib", 0
};
#endif
static const struct squashfs_decompressor squashfs_unknown_comp_ops = { static const struct squashfs_decompressor squashfs_unknown_comp_ops = {
NULL, NULL, NULL, 0, "unknown", 0 NULL, NULL, NULL, 0, "unknown", 0
}; };

4
fs/squashfs/decompressor.h
View File

@ -56,4 +56,8 @@ extern const struct squashfs_decompressor squashfs_xz_comp_ops;
extern const struct squashfs_decompressor squashfs_lzo_comp_ops; extern const struct squashfs_decompressor squashfs_lzo_comp_ops;
#endif #endif
#ifdef CONFIG_SQUASHFS_ZLIB
extern const struct squashfs_decompressor squashfs_zlib_comp_ops;
#endif
#endif #endif

3
fs/squashfs/squashfs.h
View File

@ -97,6 +97,3 @@ extern const struct inode_operations squashfs_symlink_inode_ops;
/* xattr.c */ /* xattr.c */
extern const struct xattr_handler *squashfs_xattr_handlers[]; extern const struct xattr_handler *squashfs_xattr_handlers[];
/* zlib_wrapper.c */
extern const struct squashfs_decompressor squashfs_zlib_comp_ops;