Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

[~andy/linux] / fs / logfs / compr.c

diff --git a/fs/logfs/compr.c b/fs/logfs/compr.c
index 44bbfd249abc129ac7544be77b9cbd7a62b04e3e..961f02b86d97e22f595e235e96c8876bff08214e 100644 (file)
--- a/fs/logfs/compr.c
+++ b/fs/logfs/compr.c
@@ -81,7 +81,7 @@ error:
 
 int __init logfs_compr_init(void)
 {
-       size_t size = max(zlib_deflate_workspacesize(),
+       size_t size = max(zlib_deflate_workspacesize(MAX_WBITS, MAX_MEM_LEVEL),
                        zlib_inflate_workspacesize());
        stream.workspace = vmalloc(size);
        if (!stream.workspace)