summaryrefslogtreecommitdiff
path: root/fs/jffs2/jffs2_1pass.c
diff options
context:
space:
mode:
authorwdenk <wdenk>2005-05-05 09:51:44 +0000
committerwdenk <wdenk>2005-05-05 09:51:44 +0000
commit412babe304b948e1e3a909f8d2eb091b83f700d5 (patch)
treefde6b10727916e1ec0684bd6a9fa863785ed2169 /fs/jffs2/jffs2_1pass.c
parent60fc6cbbb7d49895e3ee552539f5375f8f1303b5 (diff)
downloadu-boot-imx-412babe304b948e1e3a909f8d2eb091b83f700d5.zip
u-boot-imx-412babe304b948e1e3a909f8d2eb091b83f700d5.tar.gz
u-boot-imx-412babe304b948e1e3a909f8d2eb091b83f700d5.tar.bz2
It's better to handle LZO and LZARI compression mdoes for JFFS2 with
a single #define.
Diffstat (limited to 'fs/jffs2/jffs2_1pass.c')
-rw-r--r--fs/jffs2/jffs2_1pass.c14
1 files changed, 5 insertions, 9 deletions
diff --git a/fs/jffs2/jffs2_1pass.c b/fs/jffs2/jffs2_1pass.c
index a025116..c3553cb 100644
--- a/fs/jffs2/jffs2_1pass.c
+++ b/fs/jffs2/jffs2_1pass.c
@@ -275,10 +275,8 @@ static char *compr_names[] = {
"COPY",
"DYNRUBIN",
"ZLIB",
-#if defined(CONFIG_JFFS2_LZO)
+#if defined(CONFIG_JFFS2_LZO_LZARI)
"LZO",
-#endif
-#if defined(CONFIG_JFFS2_LZARI)
"LZARI",
#endif
};
@@ -589,15 +587,13 @@ jffs2_1pass_read_inode(struct b_lists *pL, u32 inode, char *dest)
case JFFS2_COMPR_ZLIB:
ret = zlib_decompress(src, lDest, jNode->csize, jNode->dsize);
break;
-#if defined(CONFIG_JFFS2_LZARI)
- case JFFS2_COMPR_LZARI:
- ret = lzari_decompress(src, lDest, jNode->csize, jNode->dsize);
- break;
-#endif
-#if defined(CONFIG_JFFS2_LZO)
+#if defined(CONFIG_JFFS2_LZO_LZARI)
case JFFS2_COMPR_LZO:
ret = lzo_decompress(src, lDest, jNode->csize, jNode->dsize);
break;
+ case JFFS2_COMPR_LZARI:
+ ret = lzari_decompress(src, lDest, jNode->csize, jNode->dsize);
+ break;
#endif
default:
/* unknown */