diff options
author | Phillip Lougher <phillip@lougher.demon.co.uk> | 2011-02-28 01:45:42 +0000 |
---|---|---|
committer | Phillip Lougher <phillip@lougher.demon.co.uk> | 2011-02-28 18:21:59 +0000 |
commit | b7fc0ff09d24b372dc04b0c02b80659c0a66fdfe (patch) | |
tree | 9cd9a94c3b07ef8064e1952a376d964776aa4571 /fs/squashfs/lzo_wrapper.c | |
parent | 100b33c8bd8a3235fd0b7948338d6cbb3db3c63d (diff) | |
download | linux-3.10-b7fc0ff09d24b372dc04b0c02b80659c0a66fdfe.tar.gz linux-3.10-b7fc0ff09d24b372dc04b0c02b80659c0a66fdfe.tar.bz2 linux-3.10-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/lzo_wrapper.c')
-rw-r--r-- | fs/squashfs/lzo_wrapper.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/squashfs/lzo_wrapper.c b/fs/squashfs/lzo_wrapper.c index 7da759e34c5..00f4dfc5f08 100644 --- a/fs/squashfs/lzo_wrapper.c +++ b/fs/squashfs/lzo_wrapper.c @@ -37,7 +37,7 @@ struct squashfs_lzo { void *output; }; -static void *lzo_init(struct squashfs_sb_info *msblk) +static void *lzo_init(struct squashfs_sb_info *msblk, void *buff, int len) { int block_size = max_t(int, msblk->block_size, SQUASHFS_METADATA_SIZE); @@ -58,7 +58,7 @@ failed2: failed: ERROR("Failed to allocate lzo workspace\n"); kfree(stream); - return NULL; + return ERR_PTR(-ENOMEM); } |