diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-24 08:02:21 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-24 08:02:21 -0700 |
| commit | 5818fcc8bd1b27af4d40b8357b91a56cc3fae6a4 (patch) | |
| tree | c2f266e82306fa98c78130b0dc79ef9716d3c9c7 /fs/squashfs/Kconfig | |
| parent | 0625bef6060fab4aab0e484130b59af5e9ac81bc (diff) | |
| parent | 117a91e0f25fd7698e20ac3dfa62086be3dc82a3 (diff) | |
| download | lwn-5818fcc8bd1b27af4d40b8357b91a56cc3fae6a4.tar.gz lwn-5818fcc8bd1b27af4d40b8357b91a56cc3fae6a4.zip | |
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: Use vmalloc rather than kmalloc for zlib workspace
Squashfs: handle corruption of directory structure
Squashfs: wrap squashfs_mount() definition
Squashfs: xz_wrapper doesn't need to include squashfs_fs_i.h anymore
Squashfs: Update documentation to include compression options
Squashfs: Update Kconfig help text to include xz compression
Squashfs: add compression options support to xz decompressor
Squashfs: extend decompressor framework to handle compression options
Diffstat (limited to 'fs/squashfs/Kconfig')
| -rw-r--r-- | fs/squashfs/Kconfig | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/squashfs/Kconfig b/fs/squashfs/Kconfig index aa68a8a31518..efc309fa3035 100644 --- a/fs/squashfs/Kconfig +++ b/fs/squashfs/Kconfig @@ -5,12 +5,12 @@ config SQUASHFS help Saying Y here includes support for SquashFS 4.0 (a Compressed Read-Only File System). Squashfs is a highly compressed read-only - filesystem for Linux. It uses zlib/lzo compression to compress both - files, inodes and directories. Inodes in the system are very small - and all blocks are packed to minimise data overhead. Block sizes - greater than 4K are supported up to a maximum of 1 Mbytes (default - block size 128K). SquashFS 4.0 supports 64 bit filesystems and files - (larger than 4GB), full uid/gid information, hard links and + filesystem for Linux. It uses zlib, lzo or xz compression to + compress both files, inodes and directories. Inodes in the system + are very small and all blocks are packed to minimise data overhead. + Block sizes greater than 4K are supported up to a maximum of 1 Mbytes + (default block size 128K). SquashFS 4.0 supports 64 bit filesystems + and files (larger than 4GB), full uid/gid information, hard links and timestamps. Squashfs is intended for general read-only filesystem use, for |