tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus
* git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus:
Squashfs: Make ZLIB compression support optional
Squashfs: Update documentation for XZ and add squashfs-tools devel tree
+28
-6
+3
-1
Documentation/filesystems/squashfs.txt
+3
-1
Documentation/filesystems/squashfs.txt
···
2
2
=======================
3
3
4
4
Squashfs is a compressed read-only filesystem for Linux.
5
-
It uses zlib/lzo compression to compress files, inodes and directories.
5
+
It uses zlib/lzo/xz compression to compress files, inodes and directories.
6
6
Inodes in the system are very small and all blocks are packed to minimise
7
7
data overhead. Block sizes greater than 4K are supported up to a maximum
8
8
of 1Mbytes (default block size 128K).
···
55
55
can be obtained from http://www.squashfs.org. Usage instructions can be
56
56
obtained from this site also.
57
57
58
+
The squashfs-tools development tree is now located on kernel.org
59
+
git://git.kernel.org/pub/scm/fs/squashfs/squashfs-tools.git
58
60
59
61
3. SQUASHFS FILESYSTEM DESIGN
60
62
-----------------------------
+13
-1
fs/squashfs/Kconfig
+13
-1
fs/squashfs/Kconfig
···
1
1
config SQUASHFS
2
2
tristate "SquashFS 4.0 - Squashed file system support"
3
3
depends on BLOCK
4
-
select ZLIB_INFLATE
5
4
help
6
5
Saying Y here includes support for SquashFS 4.0 (a Compressed
7
6
Read-Only File System). Squashfs is a highly compressed read-only
···
34
35
the kernel or by users (see the attr(5) manual page).
35
36
36
37
If unsure, say N.
38
+
39
+
config SQUASHFS_ZLIB
40
+
bool "Include support for ZLIB compressed file systems"
41
+
depends on SQUASHFS
42
+
select ZLIB_INFLATE
43
+
default y
44
+
help
45
+
ZLIB compression is the standard compression used by Squashfs
46
+
file systems. It offers a good trade-off between compression
47
+
achieved and the amount of CPU time and memory necessary to
48
+
compress and decompress.
49
+
50
+
If unsure, say Y.
37
51
38
52
config SQUASHFS_LZO
39
53
bool "Include support for LZO compressed file systems"
+2
-1
fs/squashfs/Makefile
+2
-1
fs/squashfs/Makefile
···
4
4
5
5
obj-$(CONFIG_SQUASHFS) += squashfs.o
6
6
squashfs-y += block.o cache.o dir.o export.o file.o fragment.o id.o inode.o
7
-
squashfs-y += namei.o super.o symlink.o zlib_wrapper.o decompressor.o
7
+
squashfs-y += namei.o super.o symlink.o decompressor.o
8
8
squashfs-$(CONFIG_SQUASHFS_XATTR) += xattr.o xattr_id.o
9
9
squashfs-$(CONFIG_SQUASHFS_LZO) += lzo_wrapper.o
10
10
squashfs-$(CONFIG_SQUASHFS_XZ) += xz_wrapper.o
11
+
squashfs-$(CONFIG_SQUASHFS_ZLIB) += zlib_wrapper.o
+6
fs/squashfs/decompressor.c
+6
fs/squashfs/decompressor.c
···
52
52
};
53
53
#endif
54
54
55
+
#ifndef CONFIG_SQUASHFS_ZLIB
56
+
static const struct squashfs_decompressor squashfs_zlib_comp_ops = {
57
+
NULL, NULL, NULL, ZLIB_COMPRESSION, "zlib", 0
58
+
};
59
+
#endif
60
+
55
61
static const struct squashfs_decompressor squashfs_unknown_comp_ops = {
56
62
NULL, NULL, NULL, 0, "unknown", 0
57
63
};
+4
fs/squashfs/decompressor.h
+4
fs/squashfs/decompressor.h