rename target/linux/generic-2.6 to generic
[openwrt/svn-archive/archive.git] / target / linux / generic-2.6 / patches-2.6.31 / 004-squashfs_add_decompressor_lzma_lzo.patch
diff --git a/target/linux/generic-2.6/patches-2.6.31/004-squashfs_add_decompressor_lzma_lzo.patch b/target/linux/generic-2.6/patches-2.6.31/004-squashfs_add_decompressor_lzma_lzo.patch
deleted file mode 100644 (file)
index a378c00..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-From 1885ca0a1973944684f252094a703b7c80dfc974 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] 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: Phillip Lougher <phillip@lougher.demon.co.uk>
----
- fs/squashfs/decompressor.c |   10 ++++++++++
- fs/squashfs/squashfs_fs.h  |    4 +++-
- 2 files changed, 13 insertions(+), 1 deletions(-)
-
---- a/fs/squashfs/decompressor.c
-+++ b/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
- };
---- a/fs/squashfs/squashfs_fs.h
-+++ b/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;