summaryrefslogtreecommitdiffstats
path: root/fs/squashfs/decompressor.c
diff options
context:
space:
mode:
authorPhillip Lougher <phillip@lougher.demon.co.uk>2010-12-09 03:08:31 +0100
committerPhillip Lougher <phillip@lougher.demon.co.uk>2011-01-13 22:16:52 +0100
commit7a43ae523744c01b6187013e781f44c2281c579c (patch)
tree7f122fb883ef7cd86f08f90b770e03cae601efd3 /fs/squashfs/decompressor.c
parentSquashfs: add XZ compression support (diff)
downloadlinux-7a43ae523744c01b6187013e781f44c2281c579c.tar.xz
linux-7a43ae523744c01b6187013e781f44c2281c579c.zip
Squashfs: Add XZ compression configuration option
Signed-off-by: Phillip Lougher <phillip@lougher.demon.co.uk>
Diffstat (limited to 'fs/squashfs/decompressor.c')
-rw-r--r--fs/squashfs/decompressor.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/fs/squashfs/decompressor.c b/fs/squashfs/decompressor.c
index 24af9ce9722f..482d78197811 100644
--- a/fs/squashfs/decompressor.c
+++ b/fs/squashfs/decompressor.c
@@ -46,6 +46,12 @@ static const struct squashfs_decompressor squashfs_lzo_unsupported_comp_ops = {
};
#endif
+#ifndef CONFIG_SQUASHFS_XZ
+static const struct squashfs_decompressor squashfs_xz_comp_ops = {
+ NULL, NULL, NULL, XZ_COMPRESSION, "xz", 0
+};
+#endif
+
static const struct squashfs_decompressor squashfs_unknown_comp_ops = {
NULL, NULL, NULL, 0, "unknown", 0
};
@@ -58,6 +64,7 @@ static const struct squashfs_decompressor *decompressor[] = {
#else
&squashfs_lzo_unsupported_comp_ops,
#endif
+ &squashfs_xz_comp_ops,
&squashfs_unknown_comp_ops
};