Commit 117a91e0 authored by Phillip Lougher's avatar Phillip Lougher

Squashfs: Use vmalloc rather than kmalloc for zlib workspace

Bugzilla bug 31422 reports occasional "page allocation failure. order:4"
at Squashfs mount time.  Fix this by making zlib workspace allocation
use vmalloc rather than kmalloc.
Reported-by: default avatarMehmet Giritli <mehmet@giritli.eu>
Signed-off-by: default avatarPhillip Lougher <phillip@lougher.demon.co.uk>
parent 44cff8a9
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
#include <linux/buffer_head.h> #include <linux/buffer_head.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/zlib.h> #include <linux/zlib.h>
#include <linux/vmalloc.h>
#include "squashfs_fs.h" #include "squashfs_fs.h"
#include "squashfs_fs_sb.h" #include "squashfs_fs_sb.h"
...@@ -37,8 +38,7 @@ static void *zlib_init(struct squashfs_sb_info *dummy, void *buff, int len) ...@@ -37,8 +38,7 @@ static void *zlib_init(struct squashfs_sb_info *dummy, void *buff, int len)
z_stream *stream = kmalloc(sizeof(z_stream), GFP_KERNEL); z_stream *stream = kmalloc(sizeof(z_stream), GFP_KERNEL);
if (stream == NULL) if (stream == NULL)
goto failed; goto failed;
stream->workspace = kmalloc(zlib_inflate_workspacesize(), stream->workspace = vmalloc(zlib_inflate_workspacesize());
GFP_KERNEL);
if (stream->workspace == NULL) if (stream->workspace == NULL)
goto failed; goto failed;
...@@ -56,7 +56,7 @@ static void zlib_free(void *strm) ...@@ -56,7 +56,7 @@ static void zlib_free(void *strm)
z_stream *stream = strm; z_stream *stream = strm;
if (stream) if (stream)
kfree(stream->workspace); vfree(stream->workspace);
kfree(stream); kfree(stream);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment