diff options
| author | Phillip Lougher <phillip@lougher.demon.co.uk> | 2011-03-22 23:01:26 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-04-14 13:02:38 -0700 |
| commit | 2b086ef28939e3cd943664fc84dc54d01d261c2c (patch) | |
| tree | 46880c0276fa8ecbc7d741baaf5e7f6b998d99b1 | |
| parent | 8f114f1414335ed352e54d0343909d7b69a81432 (diff) | |
| download | linux-stable-2b086ef28939e3cd943664fc84dc54d01d261c2c.tar.gz linux-stable-2b086ef28939e3cd943664fc84dc54d01d261c2c.tar.bz2 linux-stable-2b086ef28939e3cd943664fc84dc54d01d261c2c.zip | |
Squashfs: Use vmalloc rather than kmalloc for zlib workspace
commit 117a91e0f25fd7698e20ac3dfa62086be3dc82a3 upstream.
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: Mehmet Giritli <mehmet@giritli.eu>
Signed-off-by: Phillip Lougher <phillip@lougher.demon.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | fs/squashfs/zlib_wrapper.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/squashfs/zlib_wrapper.c b/fs/squashfs/zlib_wrapper.c index 4661ae2b1cec..04ae9a5b70a6 100644 --- a/fs/squashfs/zlib_wrapper.c +++ b/fs/squashfs/zlib_wrapper.c @@ -26,6 +26,7 @@ #include <linux/buffer_head.h> #include <linux/slab.h> #include <linux/zlib.h> +#include <linux/vmalloc.h> #include "squashfs_fs.h" #include "squashfs_fs_sb.h" @@ -37,8 +38,7 @@ static void *zlib_init(struct squashfs_sb_info *dummy) z_stream *stream = kmalloc(sizeof(z_stream), GFP_KERNEL); if (stream == NULL) goto failed; - stream->workspace = kmalloc(zlib_inflate_workspacesize(), - GFP_KERNEL); + stream->workspace = vmalloc(zlib_inflate_workspacesize()); if (stream->workspace == NULL) goto failed; @@ -56,7 +56,7 @@ static void zlib_free(void *strm) z_stream *stream = strm; if (stream) - kfree(stream->workspace); + vfree(stream->workspace); kfree(stream); } |