diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2011-04-26 04:22:15 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-04-26 04:22:59 -0400 |
| commit | 07f9479a40cc778bc1462ada11f95b01360ae4ff (patch) | |
| tree | 0676cf38df3844004bb3ebfd99dfa67a4a8998f5 /fs/logfs/compr.c | |
| parent | 9d5e6bdb3013acfb311ab407eeca0b6a6a3dedbf (diff) | |
| parent | cd2e49e90f1cae7726c9a2c54488d881d7f1cd1c (diff) | |
Merge branch 'master' into for-next
Fast-forwarded to current state of Linus' tree as there are patches to be
applied for files that didn't exist on the old branch.
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) |