From mboxrd@z Thu Jan 1 00:00:00 1970 From: root Subject: [PATCH 5/9] Squashfs: make decompressor init function pass superblock info Date: Mon, 07 Dec 2009 08:25:54 +0000 Message-ID: Return-path: Sender: linux-fsdevel-owner@vger.kernel.org List-ID: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: akpm@linux-foundation.org, linux-embedded@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, phillip.lougher@gmail.com, tim.bird@am.sony.com Signed-off-by: Phillip Lougher --- fs/squashfs/decompressor.h | 4 ++-- fs/squashfs/zlib_wrapper.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/squashfs/decompressor.h b/fs/squashfs/decompressor.h index 778760c..7425f80 100644 --- 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, diff --git a/fs/squashfs/zlib_wrapper.c b/fs/squashfs/zlib_wrapper.c index 381768c..4dd70e0 100644 --- 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) -- 1.6.3.3