mtd/fs/jffs2 Makefile,1.25,1.25.2.1 compr_zlib.c,1.8,1.8.2.1 nodelist.h,1.46.2.2,1.46.2.3 super.c,1.48.2.2,1.48.2.3 zlib.h,1.1,NONE zlib.c,1.1.2.1,NONE
David Woodhouse
dwmw2 at infradead.org
Fri Oct 11 05:04:47 EDT 2002
Update of /home/cvs/mtd/fs/jffs2
In directory phoenix.infradead.org:/tmp/cvs-serv20573
Modified Files:
Tag: jffs2-2_4-branch
Makefile compr_zlib.c nodelist.h super.c
Removed Files:
Tag: jffs2-2_4-branch
zlib.h zlib.c
Log Message:
Remove old zlib code, shared zlib is now in a released 2.4.
Index: Makefile
===================================================================
RCS file: /home/cvs/mtd/fs/jffs2/Makefile,v
retrieving revision 1.25
retrieving revision 1.25.2.1
diff -u -r1.25 -r1.25.2.1
--- Makefile 25 Sep 2001 20:59:41 -0000 1.25
+++ Makefile 11 Oct 2002 09:04:44 -0000 1.25.2.1
@@ -11,7 +11,7 @@
COMPR_OBJS := compr.o compr_rubin.o compr_rtime.o pushpull.o \
- compr_zlib.o zlib.o
+ compr_zlib.o
JFFS2_OBJS := crc32.o dir.o file.o ioctl.o nodelist.o malloc.o \
read.o nodemgmt.o readinode.o super.o write.o scan.o gc.o \
symlink.o build.o erase.o background.o
Index: compr_zlib.c
===================================================================
RCS file: /home/cvs/mtd/fs/jffs2/compr_zlib.c,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -u -r1.8 -r1.8.2.1
--- compr_zlib.c 20 Sep 2001 15:28:31 -0000 1.8
+++ compr_zlib.c 11 Oct 2002 09:04:44 -0000 1.8.2.1
@@ -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 at cambridge.redhat.com>
*
@@ -35,38 +35,18 @@
*
*/
-#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);
}
Index: nodelist.h
===================================================================
RCS file: /home/cvs/mtd/fs/jffs2/nodelist.h,v
retrieving revision 1.46.2.2
retrieving revision 1.46.2.3
diff -u -r1.46.2.2 -r1.46.2.3
--- nodelist.h 27 May 2002 09:27:50 -0000 1.46.2.2
+++ nodelist.h 11 Oct 2002 09:04:44 -0000 1.46.2.3
@@ -348,3 +348,7 @@
void jffs2_erase_pending_blocks(struct jffs2_sb_info *c);
void jffs2_mark_erased_blocks(struct jffs2_sb_info *c);
void jffs2_erase_pending_trigger(struct jffs2_sb_info *c);
+
+/* compr_zlib.c */
+int jffs2_zlib_init(void);
+void jffs2_zlib_exit(void);
Index: super.c
===================================================================
RCS file: /home/cvs/mtd/fs/jffs2/super.c,v
retrieving revision 1.48.2.2
retrieving revision 1.48.2.3
diff -u -r1.48.2.2 -r1.48.2.3
--- super.c 12 Mar 2002 15:36:43 -0000 1.48.2.2
+++ super.c 11 Oct 2002 09:04:44 -0000 1.48.2.3
@@ -361,22 +361,35 @@
}
#endif
+ ret = jffs2_zlib_init();
+ if (ret) {
+ printk(KERN_ERR "JFFS2 error: Failed to initialise zlib workspaces\n");
+ goto out;
+ }
ret = jffs2_create_slab_caches();
if (ret) {
printk(KERN_ERR "JFFS2 error: Failed to initialise slab caches\n");
- return ret;
+ goto out_zlib;
}
ret = register_filesystem(&jffs2_fs_type);
if (ret) {
printk(KERN_ERR "JFFS2 error: Failed to register filesystem\n");
- jffs2_destroy_slab_caches();
+ goto out_slab;
}
+ return 0;
+
+ out_slab:
+ jffs2_destroy_slab_caches();
+ out_zlib:
+ jffs2_zlib_exit();
+ out:
return ret;
}
static void __exit exit_jffs2_fs(void)
{
jffs2_destroy_slab_caches();
+ jffs2_zlib_exit();
unregister_filesystem(&jffs2_fs_type);
}
--- zlib.h DELETED ---
--- zlib.c DELETED ---
More information about the linux-mtd-cvs
mailing list