Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2227c0ba authored by Ferenc Havasi's avatar Ferenc Havasi Committed by Thomas Gleixner
Browse files

[jffs2] Remove compressor lzo and lzari 



Remove unused compressor code

Signed-off-by: default avatarFerenc Havasi <havasi@inf.u-szeged.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent f302cd02

fs/jffs2/compr.c

+1 −13
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
 *

 * For licensing information, see the file 'LICENCE' in this directory.

 *

 * $Id: compr.c,v 1.42 2004/08/07 21:56:08 dwmw2 Exp $

 * $Id: compr.c,v 1.45 2005/07/26 13:24:40 havasi Exp $

 *

 */
@@ -425,12 +425,6 @@ int jffs2_compressors_init(void) 
        jffs2_rubinmips_init();

        jffs2_dynrubin_init();

#endif

#ifdef CONFIG_JFFS2_LZARI

        jffs2_lzari_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;
@@ -449,12 +443,6 @@ int jffs2_compressors_init(void) 
int jffs2_compressors_exit(void) 

{

/* Unregistering compressors */

#ifdef CONFIG_JFFS2_LZO

        jffs2_lzo_exit();

#endif

#ifdef CONFIG_JFFS2_LZARI

        jffs2_lzari_exit();

#endif

#ifdef CONFIG_JFFS2_RUBIN

        jffs2_dynrubin_exit();

        jffs2_rubinmips_exit();

fs/jffs2/compr.h

+1 −9
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
 * For licensing information, see the file 'LICENCE' in the 

 * jffs2 directory.

 *

 * $Id: compr.h,v 1.6 2004/07/16 15:17:57 dwmw2 Exp $

 * $Id: compr.h,v 1.8 2005/07/26 13:24:40 havasi Exp $

 *

 */
@@ -103,13 +103,5 @@ void jffs2_rtime_exit(void); 
int jffs2_zlib_init(void);

void jffs2_zlib_exit(void);

#endif

#ifdef CONFIG_JFFS2_LZARI

int jffs2_lzari_init(void);

void jffs2_lzari_exit(void);

#endif

#ifdef CONFIG_JFFS2_LZO

int jffs2_lzo_init(void);

void jffs2_lzo_exit(void);

#endif



#endif /* __JFFS2_COMPR_H__ */

include/linux/jffs2.h

+1 −3
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
 * For licensing information, see the file 'LICENCE' in the 

 * jffs2 directory.

 *

 * $Id: jffs2.h,v 1.35 2005/07/24 15:15:51 dedekind Exp $

 * $Id: jffs2.h,v 1.36 2005/07/26 13:19:36 havasi Exp $

 *

 */
@@ -43,8 +43,6 @@ 
#define JFFS2_COMPR_COPY	0x04

#define JFFS2_COMPR_DYNRUBIN	0x05

#define JFFS2_COMPR_ZLIB	0x06

#define JFFS2_COMPR_LZO         0x07

#define JFFS2_COMPR_LZARI       0x08

/* Compatibility flags. */

#define JFFS2_COMPAT_MASK 0xc000      /* What do to if an unknown nodetype is found */

#define JFFS2_NODE_ACCURATE 0x2000