From 456d98eabe7f54557ade18b10794e9307dca571f Mon Sep 17 00:00:00 2001
From: Phillip Lougher <phillip@lougher.demon.co.uk>
Date: Wed, 14 Oct 2009 03:58:11 +0100
Subject: [PATCH] --- yaml --- r: 185846 b: refs/heads/master c:
 dc3256782f88602953676c447b243dedb1be99ad h: refs/heads/master v: v3

---
 [refs]                           |  2 +-
 trunk/fs/squashfs/decompressor.c | 10 ++++++++++
 trunk/fs/squashfs/squashfs_fs.h  |  4 +++-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 4c0081112221..695428f7e463 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4c0f0bb2351bee3de8dd7715ee199454a59f1230
+refs/heads/master: dc3256782f88602953676c447b243dedb1be99ad
diff --git a/trunk/fs/squashfs/decompressor.c b/trunk/fs/squashfs/decompressor.c
index 0072ccdac1e2..157478da6ac9 100644
--- a/trunk/fs/squashfs/decompressor.c
+++ b/trunk/fs/squashfs/decompressor.c
@@ -36,12 +36,22 @@
  * 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 = {
 	NULL, NULL, NULL, 0, "unknown", 0
 };
 
 static const struct squashfs_decompressor *decompressor[] = {
 	&squashfs_zlib_comp_ops,
+	&squashfs_lzma_unsupported_comp_ops,
+	&squashfs_lzo_unsupported_comp_ops,
 	&squashfs_unknown_comp_ops
 };
 
diff --git a/trunk/fs/squashfs/squashfs_fs.h b/trunk/fs/squashfs/squashfs_fs.h
index 283daafc568e..36e1604ab1c1 100644
--- a/trunk/fs/squashfs/squashfs_fs.h
+++ b/trunk/fs/squashfs/squashfs_fs.h
@@ -211,7 +211,9 @@ struct meta_index {
 /*
  * 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 {
 	__le32			s_magic;