diff options
| author | Phillip Lougher <phillip@squashfs.org.uk> | 2013-11-18 03:59:12 +0100 |
|---|---|---|
| committer | Phillip Lougher <phillip@squashfs.org.uk> | 2013-11-20 04:59:01 +0100 |
| commit | 846b730e99518a1c9945afcb2afbe4d08a02ed80 (patch) | |
| tree | c70eb16cbec15e5bfa1db80c5f18e062673331a9 /fs/squashfs/decompressor_multi.c | |
| parent | Squashfs: add multi-threaded decompression using percpu variable (diff) | |
| download | linux-846b730e99518a1c9945afcb2afbe4d08a02ed80.tar.xz linux-846b730e99518a1c9945afcb2afbe4d08a02ed80.zip | |
Squashfs: Generalise paging handling in the decompressors
Further generalise the decompressors by adding a page handler
abstraction. This adds helpers to allow the decompressors
to access and process the output buffers in an implementation
independant manner.
This allows different types of output buffer to be passed
to the decompressors, with the implementation specific
aspects handled at decompression time, but without the
knowledge being held in the decompressor wrapper code.
This will allow the decompressors to handle Squashfs
cache buffers, and page cache pages.
This patch adds the abstraction and an implementation for
the caches.
Signed-off-by: Phillip Lougher <phillip@squashfs.org.uk>
Reviewed-by: Minchan Kim <minchan@kernel.org>
Diffstat (limited to 'fs/squashfs/decompressor_multi.c')
| -rw-r--r-- | fs/squashfs/decompressor_multi.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/fs/squashfs/decompressor_multi.c b/fs/squashfs/decompressor_multi.c index 462731db5130..ae54675a3526 100644 --- a/fs/squashfs/decompressor_multi.c +++ b/fs/squashfs/decompressor_multi.c @@ -183,15 +183,14 @@ wait: } -int squashfs_decompress(struct squashfs_sb_info *msblk, - void **buffer, struct buffer_head **bh, int b, int offset, int length, - int srclength, int pages) +int squashfs_decompress(struct squashfs_sb_info *msblk, struct buffer_head **bh, + int b, int offset, int length, struct squashfs_page_actor *output) { int res; struct squashfs_stream *stream = msblk->stream; struct decomp_stream *decomp_stream = get_decomp_stream(msblk, stream); res = msblk->decompressor->decompress(msblk, decomp_stream->stream, - buffer, bh, b, offset, length, srclength, pages); + bh, b, offset, length, output); put_decomp_stream(decomp_stream, stream); if (res < 0) ERROR("%s decompression failed, data probably corrupt\n", |