diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /fs/logfs/compr.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
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) |