mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-11-24 21:47:30 +02:00
43 lines
1.3 KiB
Diff
43 lines
1.3 KiB
Diff
|
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)
|