diff options
| author | Patrick McHardy <kaber@trash.net> | 2011-04-13 07:32:28 -0400 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2011-04-13 07:32:28 -0400 |
| commit | b32e3dc7860d00124fa432dba09667e647cb9bcc (patch) | |
| tree | 2fa6e56f389431dfb84609d3d7572cad76e88e71 /fs/logfs/compr.c | |
| parent | 6604271c5bc658a6067ed0c3deba4d89e0e50382 (diff) | |
| parent | 96120d86fe302c006259baee9061eea9e1b9e486 (diff) | |
Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
Diffstat (limited to 'fs/logfs/compr.c')
| -rw-r--r-- | fs/logfs/compr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/logfs/compr.c b/fs/logfs/compr.c index 44bbfd249abc..961f02b86d97 100644 --- a/fs/logfs/compr.c +++ b/fs/logfs/compr.c | |||
| @@ -81,7 +81,7 @@ error: | |||
| 81 | 81 | ||
| 82 | int __init logfs_compr_init(void) | 82 | int __init logfs_compr_init(void) |
| 83 | { | 83 | { |
| 84 | size_t size = max(zlib_deflate_workspacesize(), | 84 | size_t size = max(zlib_deflate_workspacesize(MAX_WBITS, MAX_MEM_LEVEL), |
| 85 | zlib_inflate_workspacesize()); | 85 | zlib_inflate_workspacesize()); |
| 86 | stream.workspace = vmalloc(size); | 86 | stream.workspace = vmalloc(size); |
| 87 | if (!stream.workspace) | 87 | if (!stream.workspace) |