jffs2: Add LZO compression support to jffs2
Subsystems (4)
PATCH 2/5 jffs2: Add LZO compression support to jffs2
Add LZO1X compression/decompression support to jffs2.
LZO's interface doesn't entirely match that required by jffs2 so a buffer and memcpy is unavoidable.
Signed-off-by Richard Purdie <[email protected]>
--- fs/Kconfig | 10 ++++ fs/jffs2/Makefile | 1 fs/jffs2/compr.c | 6 ++ fs/jffs2/compr.h | 3 - fs/jffs2/compr_lzo.c | 120 ++++++++++++++++++++++++++++++++++++++++++++++++++ include/linux/jffs2.h | 1 6 files changed, 140 insertions(+), 1 deletion(-)
fs/Kconfig +10 -0
@@ -1310,6 +1310,16 @@ config JFFS2_ZLIB Say 'Y' if unsure. +config JFFS2_LZO + bool "JFFS2 LZO compression support" if JFFS2_COMPRESSION_OPTIONS + select LZO + depends on JFFS2_FS + default y + help + minilzo-based compression. Generally works better than Zlib. + + Say 'Y' if unsure. + config JFFS2_RTIME bool "JFFS2 RTIME compression support" if JFFS2_COMPRESSION_OPTIONS depends on JFFS2_FS
fs/jffs2/Makefile +1 -0
@@ -18,4 +18,5 @@ jffs2-$(CONFIG_JFFS2_FS_POSIX_ACL) += ac jffs2-$(CONFIG_JFFS2_RUBIN) += compr_rubin.o jffs2-$(CONFIG_JFFS2_RTIME) += compr_rtime.o jffs2-$(CONFIG_JFFS2_ZLIB) += compr_zlib.o +jffs2-$(CONFIG_JFFS2_LZO) += compr_lzo.o jffs2-$(CONFIG_JFFS2_SUMMARY) += summary.o
fs/jffs2/compr.c +6 -0
@@ -425,6 +425,9 @@ int __init jffs2_compressors_init(void)jffs2_rubinmips_init ();jffs2_dynrubin_init ();#endif +#ifdef CONFIG_JFFS2_LZO +jffs2_lzo_init (); +#endif /* Setting default compression mode */ #ifdef CONFIG_JFFS2_CMODE_NONE jffs2_compression_mode =JFFS2_COMPR_MODE_NONE ;
@@ -443,6 +446,9 @@ int __init jffs2_compressors_init(void)int jffs2_compressors_exit (void ) {/* Unregistering compressors */ +#ifdef CONFIG_JFFS2_LZO +jffs2_lzo_exit (); +#endif #ifdef CONFIG_JFFS2_RUBIN jffs2_dynrubin_exit ();jffs2_rubinmips_exit ();
fs/jffs2/compr_lzo.c new file +120 -0
120 lines not on this page · raw message
include/linux/jffs2.h +1 -0
@@ -46,6 +46,7 @@#define JFFS2_COMPR_COPY 0x04#define JFFS2_COMPR_DYNRUBIN 0x05#define JFFS2_COMPR_ZLIB 0x06 +#define JFFS2_COMPR_LZO 0x07/* Compatibility flags. */ #define JFFS2_COMPAT_MASK 0xc000/* What do to if an unknown nodetype is found */ #define JFFS2_NODE_ACCURATE 0x2000
fs/jffs2/compr.h +2 -1
@@ -30,9 +30,10 @@#define JFFS2_RUBINMIPS_PRIORITY 10#define JFFS2_DYNRUBIN_PRIORITY 20#define JFFS2_LZARI_PRIORITY 30 -#define JFFS2_LZO_PRIORITY 40#define JFFS2_RTIME_PRIORITY 50#define JFFS2_ZLIB_PRIORITY 60 +#define JFFS2_LZO_PRIORITY 80 +#define JFFS2_RUBINMIPS_DISABLED /* RUBINs will be used only */ #define JFFS2_DYNRUBIN_DISABLED /* for decompression */
David Woodhouse
maintainerQuoted 24 lines · Richard Purdie
Add LZO1X compression/decompression support to jffs2.
LZO's interface doesn't entirely match that required by jffs2 so a buffer and memcpy is unavoidable.
Signed-off-by Richard Purdie <[email protected]>Index:
linux/fs/jffs2/compr_lzo.c
===================================================================fs/jffs2/compr_lzo.c new file +12
-0@@ -0,0 +1,120 @@ +/* +* JFFS2 LZO Compression Interface +* +* Copyright (C) 2007 Nokia Corporation. All rights reserved. +* +* Author: Richard Purdie <[email protected]> +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* version 2 as published by the Free Software Foundation. +* +* This program is distributed in the hope that it will be useful, but
fs/jffs2/compr_lzo.c line 22
Quoted 10 lines
fs/jffs2/compr_lzo.c new file +10
-0+* 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, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA +* +*/
Please use the same licence, and the same boilerplate, as the rest of the JFFS2 code.
Signature · 1 line
dwmw2