diff options
author | Imre Kaloz <kaloz@openwrt.org> | 2009-11-02 09:51:35 +0000 |
---|---|---|
committer | Imre Kaloz <kaloz@openwrt.org> | 2009-11-02 09:51:35 +0000 |
commit | f4afe053da666a3d30fd2546c333c987a3282579 (patch) | |
tree | 62882bf7d10bd463052264655d89392364723f8d /target/linux/generic-2.6/patches-2.6.31/005-squashfs_extra_parameter.patch | |
parent | ce9ea905c1ffa6a2a5d74b587d89856dea472df1 (diff) | |
download | upstream-f4afe053da666a3d30fd2546c333c987a3282579.tar.gz upstream-f4afe053da666a3d30fd2546c333c987a3282579.tar.bz2 upstream-f4afe053da666a3d30fd2546c333c987a3282579.zip |
Switch to the squashfs-lzma code from the squashfs-devel git tree.
SVN-Revision: 18267
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.31/005-squashfs_extra_parameter.patch')
-rw-r--r-- | target/linux/generic-2.6/patches-2.6.31/005-squashfs_extra_parameter.patch | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.31/005-squashfs_extra_parameter.patch b/target/linux/generic-2.6/patches-2.6.31/005-squashfs_extra_parameter.patch new file mode 100644 index 0000000000..0991681346 --- /dev/null +++ b/target/linux/generic-2.6/patches-2.6.31/005-squashfs_extra_parameter.patch @@ -0,0 +1,42 @@ +From 5f393ede3ddb5dd4cc2a9f243182fac45f1ce10b Mon Sep 17 00:00:00 2001 +From: Phillip Lougher <phillip@lougher.demon.co.uk> +Date: Wed, 14 Oct 2009 04:07:54 +0100 +Subject: [PATCH] Squashfs: add an extra parameter to the decompressor init function + +Signed-off-by: Phillip Lougher <phillip@lougher.demon.co.uk> +--- + fs/squashfs/decompressor.h | 4 ++-- + fs/squashfs/zlib_wrapper.c | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +--- a/fs/squashfs/decompressor.h ++++ b/fs/squashfs/decompressor.h +@@ -24,7 +24,7 @@ + */ + + struct squashfs_decompressor { +- void *(*init)(void); ++ void *(*init)(struct squashfs_sb_info *); + void (*free)(void *); + int (*decompress)(struct squashfs_sb_info *, void **, + struct buffer_head **, int, int, int, int, int); +@@ -35,7 +35,7 @@ struct squashfs_decompressor { + + static inline void *squashfs_decompressor_init(struct squashfs_sb_info *msblk) + { +- return msblk->decompressor->init(); ++ return msblk->decompressor->init(msblk); + } + + static inline void squashfs_decompressor_free(struct squashfs_sb_info *msblk, +--- a/fs/squashfs/zlib_wrapper.c ++++ b/fs/squashfs/zlib_wrapper.c +@@ -32,7 +32,7 @@ + #include "squashfs.h" + #include "decompressor.h" + +-static void *zlib_init(void) ++static void *zlib_init(struct squashfs_sb_info *dummy) + { + z_stream *stream = kmalloc(sizeof(z_stream), GFP_KERNEL); + if (stream == NULL) |