|
|
@ -1,13 +1,9 @@ |
|
|
|
This patch adds LZMA support to the squashfs code, you should also
|
|
|
|
diff -Nur linux-2.4.32/fs/squashfs/inode.c linux-2.4.32-owrt/fs/squashfs/inode.c
|
|
|
|
change mksquashfs appropriately.
|
|
|
|
--- linux-2.4.32/fs/squashfs/inode.c 2006-03-21 13:06:10.000000000 +0100
|
|
|
|
|
|
|
|
+++ linux-2.4.32-owrt/fs/squashfs/inode.c 2006-03-21 13:12:07.000000000 +0100
|
|
|
|
Oleg I. Vdovikin <oleg@cs.msu.su>
|
|
|
|
@@ -4,6 +4,9 @@
|
|
|
|
|
|
|
|
* Copyright (c) 2002, 2003, 2004, 2005, 2006
|
|
|
|
--- linuz/fs/squashfs/inode.c 2004-12-15 22:56:47.000000000 +0300
|
|
|
|
* Phillip Lougher <phillip@lougher.org.uk>
|
|
|
|
+++ linux/fs/squashfs/inode.c 2005-01-20 20:27:27.490010968 +0300
|
|
|
|
|
|
|
|
@@ -3,6 +3,9 @@
|
|
|
|
|
|
|
|
*
|
|
|
|
|
|
|
|
* Copyright (c) 2002, 2003, 2004 Phillip Lougher <plougher@users.sourceforge.net>
|
|
|
|
|
|
|
|
*
|
|
|
|
*
|
|
|
|
+ * LZMA decompressor support added by Oleg I. Vdovikin
|
|
|
|
+ * LZMA decompressor support added by Oleg I. Vdovikin
|
|
|
|
+ * Copyright (c) 2005 Oleg I.Vdovikin <oleg@cs.msu.su>
|
|
|
|
+ * Copyright (c) 2005 Oleg I.Vdovikin <oleg@cs.msu.su>
|
|
|
@ -15,21 +11,17 @@ Oleg I. Vdovikin <oleg@cs.msu.su> |
|
|
|
* This program is free software; you can redistribute it and/or
|
|
|
|
* This program is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU General Public License
|
|
|
|
* modify it under the terms of the GNU General Public License
|
|
|
|
* as published by the Free Software Foundation; either version 2,
|
|
|
|
* as published by the Free Software Foundation; either version 2,
|
|
|
|
@@ -21,7 +24,11 @@
|
|
|
|
@@ -21,6 +24,7 @@
|
|
|
|
* inode.c
|
|
|
|
* inode.c
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
+#define SQUASHFS_LZMA
|
|
|
|
+#define SQUASHFS_LZMA
|
|
|
|
+
|
|
|
|
|
|
|
|
+#ifndef SQUASHFS_LZMA
|
|
|
|
|
|
|
|
#define SQUASHFS_1_0_COMPATIBILITY
|
|
|
|
|
|
|
|
+#endif
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#include <linux/types.h>
|
|
|
|
#include <linux/types.h>
|
|
|
|
#include <linux/squashfs_fs.h>
|
|
|
|
#include <linux/squashfs_fs.h>
|
|
|
|
@@ -39,6 +46,19 @@
|
|
|
|
#include <linux/module.h>
|
|
|
|
#include <linux/blkdev.h>
|
|
|
|
@@ -40,6 +44,20 @@
|
|
|
|
#include <linux/vmalloc.h>
|
|
|
|
|
|
|
|
|
|
|
|
#include "squashfs.h"
|
|
|
|
|
|
|
|
|
|
|
|
+#ifdef SQUASHFS_LZMA
|
|
|
|
+#ifdef SQUASHFS_LZMA
|
|
|
|
+#include "LzmaDecode.h"
|
|
|
|
+#include "LzmaDecode.h"
|
|
|
@ -40,16 +32,17 @@ Oleg I. Vdovikin <oleg@cs.msu.su> |
|
|
|
+#define LZMA_PB 2
|
|
|
|
+#define LZMA_PB 2
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+#define LZMA_WORKSPACE_SIZE ((LZMA_BASE_SIZE + \
|
|
|
|
+#define LZMA_WORKSPACE_SIZE ((LZMA_BASE_SIZE + \
|
|
|
|
+ (LZMA_LIT_SIZE << (LZMA_LC + LZMA_LP))) * sizeof(CProb))
|
|
|
|
+ (LZMA_LIT_SIZE << (LZMA_LC + LZMA_LP))) * sizeof(CProb))
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+#endif
|
|
|
|
+#endif
|
|
|
|
+
|
|
|
|
+
|
|
|
|
#ifdef SQUASHFS_TRACE
|
|
|
|
+
|
|
|
|
#define TRACE(s, args...) printk(KERN_NOTICE "SQUASHFS: "s, ## args)
|
|
|
|
static struct super_block *squashfs_read_super(struct super_block *, void *, int);
|
|
|
|
#else
|
|
|
|
static void squashfs_put_super(struct super_block *);
|
|
|
|
@@ -77,7 +97,11 @@
|
|
|
|
static int squashfs_statfs(struct super_block *, struct statfs *);
|
|
|
|
|
|
|
|
@@ -53,7 +71,11 @@
|
|
|
|
DECLARE_MUTEX(read_data_mutex);
|
|
|
|
int readahead_blks, char *block_list,
|
|
|
|
|
|
|
|
unsigned short **block_p, unsigned int *bsize);
|
|
|
|
|
|
|
|
|
|
|
|
+#ifdef SQUASHFS_LZMA
|
|
|
|
+#ifdef SQUASHFS_LZMA
|
|
|
|
+static unsigned char lzma_workspace[LZMA_WORKSPACE_SIZE];
|
|
|
|
+static unsigned char lzma_workspace[LZMA_WORKSPACE_SIZE];
|
|
|
@ -59,14 +52,14 @@ Oleg I. Vdovikin <oleg@cs.msu.su> |
|
|
|
|
|
|
|
|
|
|
|
static DECLARE_FSTYPE_DEV(squashfs_fs_type, "squashfs", squashfs_read_super);
|
|
|
|
static DECLARE_FSTYPE_DEV(squashfs_fs_type, "squashfs", squashfs_read_super);
|
|
|
|
|
|
|
|
|
|
|
|
@@ -232,6 +256,15 @@
|
|
|
|
@@ -229,6 +251,15 @@
|
|
|
|
if(compressed) {
|
|
|
|
if (compressed) {
|
|
|
|
int zlib_err;
|
|
|
|
int zlib_err;
|
|
|
|
|
|
|
|
|
|
|
|
+#ifdef SQUASHFS_LZMA
|
|
|
|
+#ifdef SQUASHFS_LZMA
|
|
|
|
+ if ((zlib_err = LzmaDecode(lzma_workspace,
|
|
|
|
+ if ((zlib_err = LzmaDecode(lzma_workspace,
|
|
|
|
+ LZMA_WORKSPACE_SIZE, LZMA_LC, LZMA_LP, LZMA_PB,
|
|
|
|
+ LZMA_WORKSPACE_SIZE, LZMA_LC, LZMA_LP, LZMA_PB,
|
|
|
|
+ c_buffer, c_byte, buffer, msBlk->read_size, &bytes)) != LZMA_RESULT_OK)
|
|
|
|
+ c_buffer, c_byte, buffer, msblk->read_size, &bytes)) != LZMA_RESULT_OK)
|
|
|
|
+ {
|
|
|
|
+ {
|
|
|
|
+ ERROR("lzma returned unexpected result 0x%x\n", zlib_err);
|
|
|
|
+ ERROR("lzma returned unexpected result 0x%x\n", zlib_err);
|
|
|
|
+ bytes = 0;
|
|
|
|
+ bytes = 0;
|
|
|
@ -75,20 +68,20 @@ Oleg I. Vdovikin <oleg@cs.msu.su> |
|
|
|
stream.next_in = c_buffer;
|
|
|
|
stream.next_in = c_buffer;
|
|
|
|
stream.avail_in = c_byte;
|
|
|
|
stream.avail_in = c_byte;
|
|
|
|
stream.next_out = buffer;
|
|
|
|
stream.next_out = buffer;
|
|
|
|
@@ -243,6 +276,7 @@
|
|
|
|
@@ -243,6 +274,7 @@
|
|
|
|
bytes = 0;
|
|
|
|
bytes = 0;
|
|
|
|
} else
|
|
|
|
} else
|
|
|
|
bytes = stream.total_out;
|
|
|
|
bytes = stream.total_out;
|
|
|
|
+#endif
|
|
|
|
+#endif
|
|
|
|
up(&read_data_mutex);
|
|
|
|
|
|
|
|
|
|
|
|
up(&msblk->read_data_mutex);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
@@ -2004,17 +2036,21 @@
|
|
|
|
@@ -1491,17 +1525,21 @@
|
|
|
|
printk(KERN_INFO "squashfs: version 3.0 (2006/03/15) "
|
|
|
|
static int __init init_squashfs_fs(void)
|
|
|
|
"Phillip Lougher\n");
|
|
|
|
{
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
+#ifndef SQUASHFS_LZMA
|
|
|
|
+#ifndef SQUASHFS_LZMA
|
|
|
|
if(!(stream.workspace = (char *) vmalloc(zlib_inflate_workspacesize()))) {
|
|
|
|
if (!(stream.workspace = vmalloc(zlib_inflate_workspacesize()))) {
|
|
|
|
ERROR("Failed to allocate zlib workspace\n");
|
|
|
|
ERROR("Failed to allocate zlib workspace\n");
|
|
|
|
return -ENOMEM;
|
|
|
|
return -ENOMEM;
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -105,8 +98,9 @@ Oleg I. Vdovikin <oleg@cs.msu.su> |
|
|
|
unregister_filesystem(&squashfs_fs_type);
|
|
|
|
unregister_filesystem(&squashfs_fs_type);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
--- linuz/fs/squashfs/LzmaDecode.c 1970-01-01 03:00:00.000000000 +0300
|
|
|
|
diff -Nur linux-2.4.32/fs/squashfs/LzmaDecode.c linux-2.4.32-owrt/fs/squashfs/LzmaDecode.c
|
|
|
|
+++ linux/fs/squashfs/LzmaDecode.c 2005-01-20 19:40:35.400513552 +0300
|
|
|
|
--- linux-2.4.32/fs/squashfs/LzmaDecode.c 1970-01-01 01:00:00.000000000 +0100
|
|
|
|
|
|
|
|
+++ linux-2.4.32-owrt/fs/squashfs/LzmaDecode.c 2006-03-21 13:06:33.000000000 +0100
|
|
|
|
@@ -0,0 +1,663 @@
|
|
|
|
@@ -0,0 +1,663 @@
|
|
|
|
+/*
|
|
|
|
+/*
|
|
|
|
+ LzmaDecode.c
|
|
|
|
+ LzmaDecode.c
|
|
|
@ -771,8 +765,9 @@ Oleg I. Vdovikin <oleg@cs.msu.su> |
|
|
|
+ *outSizeProcessed = nowPos;
|
|
|
|
+ *outSizeProcessed = nowPos;
|
|
|
|
+ return LZMA_RESULT_OK;
|
|
|
|
+ return LZMA_RESULT_OK;
|
|
|
|
+}
|
|
|
|
+}
|
|
|
|
--- linuz/fs/squashfs/LzmaDecode.h 1970-01-01 03:00:00.000000000 +0300
|
|
|
|
diff -Nur linux-2.4.32/fs/squashfs/LzmaDecode.h linux-2.4.32-owrt/fs/squashfs/LzmaDecode.h
|
|
|
|
+++ linux/fs/squashfs/LzmaDecode.h 2005-01-20 19:40:36.794301664 +0300
|
|
|
|
--- linux-2.4.32/fs/squashfs/LzmaDecode.h 1970-01-01 01:00:00.000000000 +0100
|
|
|
|
|
|
|
|
+++ linux-2.4.32-owrt/fs/squashfs/LzmaDecode.h 2006-03-21 13:06:33.000000000 +0100
|
|
|
|
@@ -0,0 +1,100 @@
|
|
|
|
@@ -0,0 +1,100 @@
|
|
|
|
+/*
|
|
|
|
+/*
|
|
|
|
+ LzmaDecode.h
|
|
|
|
+ LzmaDecode.h
|
|
|
@ -874,14 +869,15 @@ Oleg I. Vdovikin <oleg@cs.msu.su> |
|
|
|
+ UInt32 *outSizeProcessed);
|
|
|
|
+ UInt32 *outSizeProcessed);
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+#endif
|
|
|
|
+#endif
|
|
|
|
--- linuz/fs/squashfs/Makefile 2004-12-15 22:56:47.000000000 +0300
|
|
|
|
diff -Nur linux-2.4.32/fs/squashfs/Makefile linux-2.4.32-owrt/fs/squashfs/Makefile
|
|
|
|
+++ linux/fs/squashfs/Makefile 2005-01-19 23:04:25.000000000 +0300
|
|
|
|
--- linux-2.4.32/fs/squashfs/Makefile 2006-03-21 13:06:10.000000000 +0100
|
|
|
|
|
|
|
|
+++ linux-2.4.32-owrt/fs/squashfs/Makefile 2006-03-21 13:12:39.000000000 +0100
|
|
|
|
@@ -4,7 +4,7 @@
|
|
|
|
@@ -4,7 +4,7 @@
|
|
|
|
|
|
|
|
|
|
|
|
O_TARGET := squashfs.o
|
|
|
|
O_TARGET := squashfs.o
|
|
|
|
|
|
|
|
|
|
|
|
-obj-y := inode.o
|
|
|
|
-obj-y := inode.o squashfs2_0.o
|
|
|
|
+obj-y := inode.o LzmaDecode.o
|
|
|
|
+obj-y := inode.o squashfs2_0.o LzmaDecode.o
|
|
|
|
|
|
|
|
|
|
|
|
obj-m := $(O_TARGET)
|
|
|
|
obj-m := $(O_TARGET)
|
|
|
|
|
|
|
|
|
|
|
|