Switch to the squashfs-lzma code from the squashfs-devel git tree.
[openwrt.git] / target / linux / generic-2.6 / patches-2.6.30 / 005-squashfs_extra_parameter.patch
1 From 5f393ede3ddb5dd4cc2a9f243182fac45f1ce10b Mon Sep 17 00:00:00 2001
2 From: Phillip Lougher <phillip@lougher.demon.co.uk>
3 Date: Wed, 14 Oct 2009 04:07:54 +0100
4 Subject: [PATCH] Squashfs: add an extra parameter to the decompressor init function
5
6 Signed-off-by: Phillip Lougher <phillip@lougher.demon.co.uk>
7 ---
8 fs/squashfs/decompressor.h | 4 ++--
9 fs/squashfs/zlib_wrapper.c | 2 +-
10 2 files changed, 3 insertions(+), 3 deletions(-)
11
12 --- a/fs/squashfs/decompressor.h
13 +++ b/fs/squashfs/decompressor.h
14 @@ -24,7 +24,7 @@
15 */
16
17 struct squashfs_decompressor {
18 - void *(*init)(void);
19 + void *(*init)(struct squashfs_sb_info *);
20 void (*free)(void *);
21 int (*decompress)(struct squashfs_sb_info *, void **,
22 struct buffer_head **, int, int, int, int, int);
23 @@ -35,7 +35,7 @@ struct squashfs_decompressor {
24
25 static inline void *squashfs_decompressor_init(struct squashfs_sb_info *msblk)
26 {
27 - return msblk->decompressor->init();
28 + return msblk->decompressor->init(msblk);
29 }
30
31 static inline void squashfs_decompressor_free(struct squashfs_sb_info *msblk,
32 --- a/fs/squashfs/zlib_wrapper.c
33 +++ b/fs/squashfs/zlib_wrapper.c
34 @@ -32,7 +32,7 @@
35 #include "squashfs.h"
36 #include "decompressor.h"
37
38 -static void *zlib_init(void)
39 +static void *zlib_init(struct squashfs_sb_info *dummy)
40 {
41 z_stream *stream = kmalloc(sizeof(z_stream), GFP_KERNEL);
42 if (stream == NULL)
This page took 0.054794 seconds and 5 git commands to generate.