aboutsummaryrefslogtreecommitdiffstats
path: root/fs/jffs2/compr_zlib.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/jffs2/compr_zlib.c')
-rw-r--r--fs/jffs2/compr_zlib.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/fs/jffs2/compr_zlib.c b/fs/jffs2/compr_zlib.c
index 97fc45de6f81..5a001020c542 100644
--- a/fs/jffs2/compr_zlib.c
+++ b/fs/jffs2/compr_zlib.c
@@ -40,12 +40,13 @@ static z_stream inf_strm, def_strm;
40 40
41static int __init alloc_workspaces(void) 41static int __init alloc_workspaces(void)
42{ 42{
43 def_strm.workspace = vmalloc(zlib_deflate_workspacesize()); 43 def_strm.workspace = vmalloc(zlib_deflate_workspacesize(MAX_WBITS,
44 MAX_MEM_LEVEL));
44 if (!def_strm.workspace) { 45 if (!def_strm.workspace) {
45 printk(KERN_WARNING "Failed to allocate %d bytes for deflate workspace\n", zlib_deflate_workspacesize()); 46 printk(KERN_WARNING "Failed to allocate %d bytes for deflate workspace\n", zlib_deflate_workspacesize(MAX_WBITS, MAX_MEM_LEVEL));
46 return -ENOMEM; 47 return -ENOMEM;
47 } 48 }
48 D1(printk(KERN_DEBUG "Allocated %d bytes for deflate workspace\n", zlib_deflate_workspacesize())); 49 D1(printk(KERN_DEBUG "Allocated %d bytes for deflate workspace\n", zlib_deflate_workspacesize(MAX_WBITS, MAX_MEM_LEVEL)));
49 inf_strm.workspace = vmalloc(zlib_inflate_workspacesize()); 50 inf_strm.workspace = vmalloc(zlib_inflate_workspacesize());
50 if (!inf_strm.workspace) { 51 if (!inf_strm.workspace) {
51 printk(KERN_WARNING "Failed to allocate %d bytes for inflate workspace\n", zlib_inflate_workspacesize()); 52 printk(KERN_WARNING "Failed to allocate %d bytes for inflate workspace\n", zlib_inflate_workspacesize());
@@ -68,8 +69,7 @@ static void free_workspaces(void)
68 69
69static int jffs2_zlib_compress(unsigned char *data_in, 70static int jffs2_zlib_compress(unsigned char *data_in,
70 unsigned char *cpage_out, 71 unsigned char *cpage_out,
71 uint32_t *sourcelen, uint32_t *dstlen, 72 uint32_t *sourcelen, uint32_t *dstlen)
72 void *model)
73{ 73{
74 int ret; 74 int ret;
75 75
@@ -136,8 +136,7 @@ static int jffs2_zlib_compress(unsigned char *data_in,
136 136
137static int jffs2_zlib_decompress(unsigned char *data_in, 137static int jffs2_zlib_decompress(unsigned char *data_in,
138 unsigned char *cpage_out, 138 unsigned char *cpage_out,
139 uint32_t srclen, uint32_t destlen, 139 uint32_t srclen, uint32_t destlen)
140 void *model)
141{ 140{
142 int ret; 141 int ret;
143 int wbits = MAX_WBITS; 142 int wbits = MAX_WBITS;