summaryrefslogtreecommitdiffstats
path: root/fs/squashfs/decompressor.h
diff options
context:
space:
mode:
authorPhillip Lougher <phillip@lougher.demon.co.uk>2011-02-28 01:45:42 +0000
committerPhillip Lougher <phillip@lougher.demon.co.uk>2011-02-28 18:21:59 +0000
commitb7fc0ff09d24b372dc04b0c02b80659c0a66fdfe (patch)
tree9cd9a94c3b07ef8064e1952a376d964776aa4571 /fs/squashfs/decompressor.h
parent100b33c8bd8a3235fd0b7948338d6cbb3db3c63d (diff)
downloadlinux-stable-b7fc0ff09d24b372dc04b0c02b80659c0a66fdfe.tar.gz
linux-stable-b7fc0ff09d24b372dc04b0c02b80659c0a66fdfe.tar.bz2
linux-stable-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/decompressor.h')
-rw-r--r--fs/squashfs/decompressor.h7
1 files changed, 1 insertions, 6 deletions
diff --git a/fs/squashfs/decompressor.h b/fs/squashfs/decompressor.h
index 3b305a70f7aa..099745ad5691 100644
--- a/fs/squashfs/decompressor.h
+++ b/fs/squashfs/decompressor.h
@@ -24,7 +24,7 @@
*/
struct squashfs_decompressor {
- void *(*init)(struct squashfs_sb_info *);
+ void *(*init)(struct squashfs_sb_info *, void *, int);
void (*free)(void *);
int (*decompress)(struct squashfs_sb_info *, void **,
struct buffer_head **, int, int, int, int, int);
@@ -33,11 +33,6 @@ struct squashfs_decompressor {
int supported;
};
-static inline void *squashfs_decompressor_init(struct squashfs_sb_info *msblk)
-{
- return msblk->decompressor->init(msblk);
-}
-
static inline void squashfs_decompressor_free(struct squashfs_sb_info *msblk,
void *s)
{