patch-2.4.20 linux-2.4.20/fs/jffs2/compr_zlib.c
Next file: linux-2.4.20/fs/jffs2/dir.c
Previous file: linux-2.4.20/fs/jffs2/Makefile
Back to the patch index
Back to the overall index
- Lines: 193
- Date:
Thu Nov 28 15:53:15 2002
- Orig file:
linux-2.4.19/fs/jffs2/compr_zlib.c
- Orig date:
Thu Oct 4 15:13:18 2001
diff -urN linux-2.4.19/fs/jffs2/compr_zlib.c linux-2.4.20/fs/jffs2/compr_zlib.c
@@ -1,7 +1,7 @@
/*
* JFFS2 -- Journalling Flash File System, Version 2.
*
- * Copyright (C) 2001 Red Hat, Inc.
+ * Copyright (C) 2001, 2002 Red Hat, Inc.
*
* Created by David Woodhouse <dwmw2@cambridge.redhat.com>
*
@@ -31,42 +31,22 @@
* provisions above, a recipient may use your version of this file
* under either the RHEPL or the GPL.
*
- * $Id: compr_zlib.c,v 1.8 2001/09/20 15:28:31 dwmw2 Exp $
+ * $Id: compr_zlib.c,v 1.8.2.1 2002/10/11 09:04:44 dwmw2 Exp $
*
*/
-#include "zlib.h"
+#ifndef __KERNEL__
+#error "The userspace support got too messy and was removed. Update your mkfs.jffs2"
+#endif
-#ifdef __KERNEL__
+#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/mtd/compatmac.h> /* for min() */
#include <linux/slab.h>
#include <linux/jffs2.h>
+#include <linux/zlib.h>
#include "nodelist.h"
-static void *zalloc(void *opaque, unsigned nr, unsigned size)
-{
- /* How much does it request? Should we use vmalloc? Or be dynamic? */
- return kmalloc(nr * size, GFP_KERNEL);
-}
-
-static void zfree(void *opaque, void *addr)
-{
- kfree(addr);
-}
-#else
-#define min(x,y) ((x)<(y)?(x):(y))
-#ifndef D1
-#define D1(x)
-#endif
-#define KERN_DEBUG
-#define KERN_NOTICE
-#define KERN_WARNING
-#define printk printf
-#include <stdio.h>
-#include <asm/types.h>
-#endif
-
/* Plan: call deflate() with avail_in == *sourcelen,
avail_out = *dstlen - 12 and flush == Z_FINISH.
If it doesn't manage to finish, call it again with
@@ -76,6 +56,35 @@
*/
#define STREAM_END_SPACE 12
+static DECLARE_MUTEX(deflate_sem);
+static DECLARE_MUTEX(inflate_sem);
+static void *deflate_workspace;
+static void *inflate_workspace;
+
+int __init jffs2_zlib_init(void)
+{
+ deflate_workspace = vmalloc(zlib_deflate_workspacesize());
+ if (!deflate_workspace) {
+ printk(KERN_WARNING "Failed to allocate %d bytes for deflate workspace\n", zlib_deflate_workspacesize());
+ return -ENOMEM;
+ }
+ D1(printk(KERN_DEBUG "Allocated %d bytes for deflate workspace\n", zlib_deflate_workspacesize()));
+ inflate_workspace = vmalloc(zlib_inflate_workspacesize());
+ if (!inflate_workspace) {
+ printk(KERN_WARNING "Failed to allocate %d bytes for inflate workspace\n", zlib_inflate_workspacesize());
+ vfree(deflate_workspace);
+ return -ENOMEM;
+ }
+ D1(printk(KERN_DEBUG "Allocated %d bytes for inflate workspace\n", zlib_inflate_workspacesize()));
+ return 0;
+}
+
+void jffs2_zlib_exit(void)
+{
+ vfree(deflate_workspace);
+ vfree(inflate_workspace);
+}
+
int zlib_compress(unsigned char *data_in, unsigned char *cpage_out,
__u32 *sourcelen, __u32 *dstlen)
{
@@ -85,18 +94,15 @@
if (*dstlen <= STREAM_END_SPACE)
return -1;
-#ifdef __KERNEL__
- strm.zalloc = zalloc;
- strm.zfree = zfree;
-#else
- strm.zalloc = (void *)0;
- strm.zfree = (void *)0;
-#endif
+ down(&deflate_sem);
+ strm.workspace = deflate_workspace;
- if (Z_OK != deflateInit(&strm, 3)) {
+ if (Z_OK != zlib_deflateInit(&strm, 3)) {
printk(KERN_WARNING "deflateInit failed\n");
+ up(&deflate_sem);
return -1;
}
+
strm.next_in = data_in;
strm.total_in = 0;
@@ -108,31 +114,32 @@
strm.avail_in = min((unsigned)(*sourcelen-strm.total_in), strm.avail_out);
D1(printk(KERN_DEBUG "calling deflate with avail_in %d, avail_out %d\n",
strm.avail_in, strm.avail_out));
- ret = deflate(&strm, Z_PARTIAL_FLUSH);
+ ret = zlib_deflate(&strm, Z_PARTIAL_FLUSH);
D1(printk(KERN_DEBUG "deflate returned with avail_in %d, avail_out %d, total_in %ld, total_out %ld\n",
strm.avail_in, strm.avail_out, strm.total_in, strm.total_out));
if (ret != Z_OK) {
D1(printk(KERN_DEBUG "deflate in loop returned %d\n", ret));
- deflateEnd(&strm);
+ zlib_deflateEnd(&strm);
+ up(&deflate_sem);
return -1;
}
}
strm.avail_out += STREAM_END_SPACE;
strm.avail_in = 0;
- ret = deflate(&strm, Z_FINISH);
+ ret = zlib_deflate(&strm, Z_FINISH);
+ zlib_deflateEnd(&strm);
+ up(&deflate_sem);
if (ret != Z_STREAM_END) {
D1(printk(KERN_DEBUG "final deflate returned %d\n", ret));
- deflateEnd(&strm);
return -1;
}
- deflateEnd(&strm);
- D1(printk(KERN_DEBUG "zlib compressed %ld bytes into %ld\n", strm.total_in, strm.total_out));
+ D1(printk(KERN_DEBUG "zlib compressed %ld bytes into %ld\n",
+ strm.total_in, strm.total_out));
if (strm.total_out >= strm.total_in)
return -1;
-
*dstlen = strm.total_out;
*sourcelen = strm.total_in;
return 0;
@@ -144,16 +151,12 @@
z_stream strm;
int ret;
-#ifdef __KERNEL__
- strm.zalloc = zalloc;
- strm.zfree = zfree;
-#else
- strm.zalloc = (void *)0;
- strm.zfree = (void *)0;
-#endif
+ down(&inflate_sem);
+ strm.workspace = inflate_workspace;
- if (Z_OK != inflateInit(&strm)) {
+ if (Z_OK != zlib_inflateInit(&strm)) {
printk(KERN_WARNING "inflateInit failed\n");
+ up(&inflate_sem);
return;
}
strm.next_in = data_in;
@@ -164,10 +167,11 @@
strm.avail_out = destlen;
strm.total_out = 0;
- while((ret = inflate(&strm, Z_FINISH)) == Z_OK)
+ while((ret = zlib_inflate(&strm, Z_FINISH)) == Z_OK)
;
if (ret != Z_STREAM_END) {
printk(KERN_NOTICE "inflate returned %d\n", ret);
}
- inflateEnd(&strm);
+ zlib_inflateEnd(&strm);
+ up(&inflate_sem);
}
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)