lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Squashfs: add decompressor entries for lzma and lzo

Browse Source 
Add knowledge of lzma/lzo compression formats to the decompressor
framework.  For now these are added as unsupported.  Without
these entries lzma/lzo compressed filesystems will be flagged as
having unknown compression which is undesirable.

Signed-off-by: Phillip Lougher <phillip@lougher.demon.co.uk>
This commit is contained in:
Phillip Lougher
2009-10-14 03:58:11 +01:00
parent 4c0f0bb235
commit dc3256782f
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
fs/squashfs/decompressor.c
View File

@@ -36,12 +36,22 @@
* Squashfs, allowing multiple decompressors to be easily supported * Squashfs, allowing multiple decompressors to be easily supported
*/ */
static const struct squashfs_decompressor squashfs_lzma_unsupported_comp_ops = {
NULL, NULL, NULL, LZMA_COMPRESSION, "lzma", 0
};
static const struct squashfs_decompressor squashfs_lzo_unsupported_comp_ops = {
NULL, NULL, NULL, LZO_COMPRESSION, "lzo", 0
};
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
}; };
static const struct squashfs_decompressor *decompressor[] = { static const struct squashfs_decompressor *decompressor[] = {
&squashfs_zlib_comp_ops, &squashfs_zlib_comp_ops,
&squashfs_lzma_unsupported_comp_ops,
&squashfs_lzo_unsupported_comp_ops,
&squashfs_unknown_comp_ops &squashfs_unknown_comp_ops
}; };

2
fs/squashfs/squashfs_fs.h
View File

@@ -212,6 +212,8 @@ struct meta_index {
* definitions for structures on disk * definitions for structures on disk
*/ */
#define ZLIB_COMPRESSION 1 #define ZLIB_COMPRESSION 1
#define LZMA_COMPRESSION 2
#define LZO_COMPRESSION 3
struct squashfs_super_block { struct squashfs_super_block {
__le32 s_magic; __le32 s_magic;