lkml.org 
[lkml]   [2011]   [Apr]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[098/105] Squashfs: Use vmalloc rather than kmalloc for zlib workspace
    2.6.38-stable review patch.  If anyone has any objections, please let us know.

    ------------------

    From: Phillip Lougher <phillip@lougher.demon.co.uk>

    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>

    ---
    fs/squashfs/zlib_wrapper.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    --- 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_s
    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);
    }




    \
     
     \ /
      Last update: 2011-04-12 16:43    [W:0.021 / U:0.116 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site