diff options
| author | Phillip Lougher <phillip@lougher.demon.co.uk> | 2011-02-28 02:45:42 +0100 |
|---|---|---|
| committer | Phillip Lougher <phillip@lougher.demon.co.uk> | 2011-02-28 19:21:59 +0100 |
| commit | b7fc0ff09d24b372dc04b0c02b80659c0a66fdfe (patch) | |
| tree | 9cd9a94c3b07ef8064e1952a376d964776aa4571 /fs/squashfs/zlib_wrapper.c | |
| parent | Linux 2.6.38-rc4 (diff) | |
| download | linux-b7fc0ff09d24b372dc04b0c02b80659c0a66fdfe.tar.xz linux-b7fc0ff09d24b372dc04b0c02b80659c0a66fdfe.zip | |
Squashfs: extend decompressor framework to handle compression options
Extend decompressor framework to handle compression options stored in
the filesystem. These options can be used by the relevant decompressor
at initialisation time to over-ride defaults.
The presence of compression options in the filesystem is indicated by
the COMP_OPT filesystem flag. If present the data is read from the
filesystem and passed to the decompressor init function. The decompressor
init function signature has been extended to take this data.
Also update the init function signature in the glib, lzo and xz
decompressor wrappers.
Signed-off-by: Phillip Lougher <phillip@lougher.demon.co.uk>
Diffstat (limited to 'fs/squashfs/zlib_wrapper.c')
| -rw-r--r-- | fs/squashfs/zlib_wrapper.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/squashfs/zlib_wrapper.c b/fs/squashfs/zlib_wrapper.c index 4661ae2b1cec..195b0d035e9b 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(struct squashfs_sb_info *dummy) +static void *zlib_init(struct squashfs_sb_info *dummy, void *buff, int len) { z_stream *stream = kmalloc(sizeof(z_stream), GFP_KERNEL); if (stream == NULL) @@ -47,7 +47,7 @@ static void *zlib_init(struct squashfs_sb_info *dummy) failed: ERROR("Failed to allocate zlib workspace\n"); kfree(stream); - return NULL; + return ERR_PTR(-ENOMEM); } |