diff options
| author | Phillip Lougher <phillip@lougher.demon.co.uk> | 2009-10-06 05:04:15 +0200 |
|---|---|---|
| committer | Phillip Lougher <phillip@lougher.demon.co.uk> | 2010-01-20 22:47:47 +0100 |
| commit | 4c0f0bb2351bee3de8dd7715ee199454a59f1230 (patch) | |
| tree | c552993587a8e87f7ebc0fe0955efdde94cc8884 /fs/squashfs/block.c | |
| parent | Squashfs: factor out remaining zlib dependencies into separate wrapper file (diff) | |
| download | linux-4c0f0bb2351bee3de8dd7715ee199454a59f1230.tar.xz linux-4c0f0bb2351bee3de8dd7715ee199454a59f1230.zip | |
Squashfs: add a decompressor framework
This adds a decompressor framework which allows multiple compression
algorithms to be cleanly supported.
Also update zlib wrapper and other code to use the new framework.
Signed-off-by: Phillip Lougher <phillip@lougher.demon.co.uk>
Diffstat (limited to 'fs/squashfs/block.c')
| -rw-r--r-- | fs/squashfs/block.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/squashfs/block.c b/fs/squashfs/block.c index 3f836e181eb8..1cb0d81b164b 100644 --- a/fs/squashfs/block.c +++ b/fs/squashfs/block.c @@ -36,6 +36,7 @@ #include "squashfs_fs_sb.h" #include "squashfs_fs_i.h" #include "squashfs.h" +#include "decompressor.h" /* * Read the metadata block length, this is stored in the first two @@ -151,7 +152,7 @@ int squashfs_read_data(struct super_block *sb, void **buffer, u64 index, } if (compressed) { - length = squashfs_zlib_uncompress(msblk, buffer, bh, b, offset, + length = squashfs_decompress(msblk, buffer, bh, b, offset, length, srclength, pages); if (length < 0) goto read_failure; |