Kaynağa Gözat

Squashfs: update Kconfig and documentation for LZO

Update compression types supported and add some help text for
the LZO Kconfig option.

Also add missing "default n" line and make some trivial whitespace
cleanups too.

Signed-off-by: Phillip Lougher <phillip@lougher.demon.co.uk>
Phillip Lougher 15 yıl önce
ebeveyn
işleme
4b676d2dbe
2 değiştirilmiş dosya ile 15 ekleme ve 5 silme
  1. 1 1
      Documentation/filesystems/squashfs.txt
  2. 14 4
      fs/squashfs/Kconfig

+ 1 - 1
Documentation/filesystems/squashfs.txt

@@ -2,7 +2,7 @@ SQUASHFS 4.0 FILESYSTEM
 =======================
 =======================
 
 
 Squashfs is a compressed read-only filesystem for Linux.
 Squashfs is a compressed read-only filesystem for Linux.
-It uses zlib compression to compress files, inodes and directories.
+It uses zlib/lzo compression to compress files, inodes and directories.
 Inodes in the system are very small and all blocks are packed to minimise
 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
 data overhead. Block sizes greater than 4K are supported up to a maximum
 of 1Mbytes (default block size 128K).
 of 1Mbytes (default block size 128K).

+ 14 - 4
fs/squashfs/Kconfig

@@ -5,13 +5,13 @@ config SQUASHFS
 	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
-	  filesystem for Linux.  It uses zlib compression to compress both
+	  filesystem for Linux.  It uses zlib/lzo compression to compress both
 	  files, inodes and directories.  Inodes in the system are very small
 	  files, inodes and directories.  Inodes in the system are very small
 	  and all blocks are packed to minimise data overhead. Block sizes
 	  and all blocks are packed to minimise data overhead. Block sizes
 	  greater than 4K are supported up to a maximum of 1 Mbytes (default
 	  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
 	  block size 128K).  SquashFS 4.0 supports 64 bit filesystems and files
 	  (larger than 4GB), full uid/gid information, hard links and
 	  (larger than 4GB), full uid/gid information, hard links and
-	  timestamps.  
+	  timestamps.
 
 
 	  Squashfs is intended for general read-only filesystem use, for
 	  Squashfs is intended for general read-only filesystem use, for
 	  archival use (i.e. in cases where a .tar.gz file may be used), and in
 	  archival use (i.e. in cases where a .tar.gz file may be used), and in
@@ -40,11 +40,21 @@ config SQUASHFS_XATTR
 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
+	default n
 	select LZO_DECOMPRESS
 	select LZO_DECOMPRESS
+	help
+	  Saying Y here includes support for reading Squashfs file systems
+	  compressed with LZO compresssion.  LZO compression is mainly
+	  aimed at embedded systems with slower CPUs where the overheads
+	  of zlib are too high.
 
 
-config SQUASHFS_EMBEDDED
+	  LZO is not the standard compression used in Squashfs and so most
+	  file systems will be readable without selecting this option.
 
 
-	bool "Additional option for memory-constrained systems" 
+	  If unsure, say N.
+
+config SQUASHFS_EMBEDDED
+	bool "Additional option for memory-constrained systems"
 	depends on SQUASHFS
 	depends on SQUASHFS
 	default n
 	default n
 	help
 	help