diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-14 14:42:53 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-14 14:42:53 -0800 |
| commit | 7a02d089695a1217992434f03a78aa32bad85b5c (patch) | |
| tree | 606288e042051e3c280275b1de7fa4be064420c6 /fs/squashfs/decompressor.h | |
| parent | 980f3c344ff1cb4a8be9a169c6bde2dc74ca6288 (diff) | |
| parent | 62421645bb702c077ee5a462815525106cb53bcf (diff) | |
Merge tag 'squashfs-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-next
Pull squashfs update from Phillip Lougher:
"These patches optionally add LZ4 compression support to Squashfs.
LZ4 is a lightweight compression algorithm which can be used on
embedded systems to reduce CPU and memory overhead (in comparison to
the standard zlib compression).
These patches add the wrapper code to allow Squashfs to use the
existing LZ4 decompression code, and the necessary configuration
option"
* tag 'squashfs-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-next:
Squashfs: Add LZ4 compression configuration option
Squashfs: add LZ4 compression support
Diffstat (limited to 'fs/squashfs/decompressor.h')
| -rw-r--r-- | fs/squashfs/decompressor.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/squashfs/decompressor.h b/fs/squashfs/decompressor.h index af0985321808..a25713c031a5 100644 --- a/fs/squashfs/decompressor.h +++ b/fs/squashfs/decompressor.h @@ -46,6 +46,10 @@ static inline void *squashfs_comp_opts(struct squashfs_sb_info *msblk, extern const struct squashfs_decompressor squashfs_xz_comp_ops; #endif +#ifdef CONFIG_SQUASHFS_LZ4 +extern const struct squashfs_decompressor squashfs_lz4_comp_ops; +#endif + #ifdef CONFIG_SQUASHFS_LZO extern const struct squashfs_decompressor squashfs_lzo_comp_ops; #endif |