Commit dc325678 authored by Phillip Lougher's avatar Phillip Lougher

Squashfs: add decompressor entries for lzma and lzo

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: default avatarPhillip Lougher <phillip@lougher.demon.co.uk>
parent 4c0f0bb2
...@@ -36,12 +36,22 @@ ...@@ -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
}; };
......
...@@ -211,7 +211,9 @@ struct meta_index { ...@@ -211,7 +211,9 @@ 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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment