forked from Minki/linux
9508c6b90b
The decompressor interface and code was written from
the point of view of single-threaded operation. In doing
so it mixed a lot of single-threaded implementation specific
aspects into the decompressor code and elsewhere which makes it
difficult to seamlessly support multiple different decompressor
implementations.
This patch does the following:
1. It removes compressor_options parsing from the decompressor
init() function. This allows the decompressor init() function
to be dynamically called to instantiate multiple decompressors,
without the compressor options needing to be read and parsed each
time.
2. It moves threading and all sleeping operations out of the
decompressors. In doing so, it makes the decompressors
non-blocking wrappers which only deal with interfacing with
the decompressor implementation.
3. It splits decompressor.[ch] into decompressor generic functions
in decompressor.[ch], and moves the single threaded
decompressor implementation into decompressor_single.c.
The result of this patch is Squashfs should now be able to
support multiple decompressors by adding new decompressor_xxx.c
files with specialised implementations of the functions in
decompressor_single.c
Signed-off-by: Phillip Lougher <phillip@squashfs.org.uk>
Reviewed-by: Minchan Kim <minchan@kernel.org>
57 lines
1.7 KiB
C
57 lines
1.7 KiB
C
#ifndef DECOMPRESSOR_H
|
|
#define DECOMPRESSOR_H
|
|
/*
|
|
* Squashfs - a compressed read only filesystem for Linux
|
|
*
|
|
* Copyright (c) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
|
|
* Phillip Lougher <phillip@squashfs.org.uk>
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; either version 2,
|
|
* or (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
*
|
|
* decompressor.h
|
|
*/
|
|
|
|
struct squashfs_decompressor {
|
|
void *(*init)(struct squashfs_sb_info *, void *);
|
|
void *(*comp_opts)(struct squashfs_sb_info *, void *, int);
|
|
void (*free)(void *);
|
|
int (*decompress)(struct squashfs_sb_info *, void *, void **,
|
|
struct buffer_head **, int, int, int, int, int);
|
|
int id;
|
|
char *name;
|
|
int supported;
|
|
};
|
|
|
|
static inline void *squashfs_comp_opts(struct squashfs_sb_info *msblk,
|
|
void *buff, int length)
|
|
{
|
|
return msblk->decompressor->comp_opts ?
|
|
msblk->decompressor->comp_opts(msblk, buff, length) : NULL;
|
|
}
|
|
|
|
#ifdef CONFIG_SQUASHFS_XZ
|
|
extern const struct squashfs_decompressor squashfs_xz_comp_ops;
|
|
#endif
|
|
|
|
#ifdef CONFIG_SQUASHFS_LZO
|
|
extern const struct squashfs_decompressor squashfs_lzo_comp_ops;
|
|
#endif
|
|
|
|
#ifdef CONFIG_SQUASHFS_ZLIB
|
|
extern const struct squashfs_decompressor squashfs_zlib_comp_ops;
|
|
#endif
|
|
|
|
#endif
|