diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-26 01:50:35 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-26 01:50:35 -0400 |
| commit | 91d44d99992ff2587104df5760bfffbb3564b3c2 (patch) | |
| tree | 71316dfc11385f5594962f91d7192fdd851e86a8 /Documentation/filesystems | |
| parent | 2dad3206db5c3832cde1f58650027fea3ff7adf3 (diff) | |
| parent | cc6d3497141adedb71de8ddce62bf4cd4817832d (diff) | |
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
Diffstat (limited to 'Documentation/filesystems')
| -rw-r--r-- | Documentation/filesystems/squashfs.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/filesystems/squashfs.txt b/Documentation/filesystems/squashfs.txt index d4d41465a0b1..7db3ebda5a4c 100644 --- a/Documentation/filesystems/squashfs.txt +++ b/Documentation/filesystems/squashfs.txt | |||
| @@ -2,7 +2,7 @@ SQUASHFS 4.0 FILESYSTEM | |||
| 2 | ======================= | 2 | ======================= |
| 3 | 3 | ||
| 4 | Squashfs is a compressed read-only filesystem for Linux. | 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 | Inodes in the system are very small and all blocks are packed to minimise | 6 | Inodes in the system are very small and all blocks are packed to minimise |
| 7 | data overhead. Block sizes greater than 4K are supported up to a maximum | 7 | data overhead. Block sizes greater than 4K are supported up to a maximum |
| 8 | of 1Mbytes (default block size 128K). | 8 | of 1Mbytes (default block size 128K). |
| @@ -55,6 +55,8 @@ create populated squashfs filesystems. This and other squashfs utilities | |||
| 55 | can be obtained from http://www.squashfs.org. Usage instructions can be | 55 | can be obtained from http://www.squashfs.org. Usage instructions can be |
| 56 | obtained from this site also. | 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 | 3. SQUASHFS FILESYSTEM DESIGN | 61 | 3. SQUASHFS FILESYSTEM DESIGN |
| 60 | ----------------------------- | 62 | ----------------------------- |