lkml.org 
[lkml]   [2010]   [Nov]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 06/49] crypto: Use vzalloc
    Date
    Signed-off-by: Joe Perches <joe@perches.com>
    ---
    crypto/deflate.c | 3 +--
    crypto/zlib.c | 3 +--
    2 files changed, 2 insertions(+), 4 deletions(-)

    diff --git a/crypto/deflate.c b/crypto/deflate.c
    index 463dc85..cbc7a33 100644
    --- a/crypto/deflate.c
    +++ b/crypto/deflate.c
    @@ -48,12 +48,11 @@ static int deflate_comp_init(struct deflate_ctx *ctx)
    int ret = 0;
    struct z_stream_s *stream = &ctx->comp_stream;

    - stream->workspace = vmalloc(zlib_deflate_workspacesize());
    + stream->workspace = vzalloc(zlib_deflate_workspacesize());
    if (!stream->workspace) {
    ret = -ENOMEM;
    goto out;
    }
    - memset(stream->workspace, 0, zlib_deflate_workspacesize());
    ret = zlib_deflateInit2(stream, DEFLATE_DEF_LEVEL, Z_DEFLATED,
    -DEFLATE_DEF_WINBITS, DEFLATE_DEF_MEMLEVEL,
    Z_DEFAULT_STRATEGY);
    diff --git a/crypto/zlib.c b/crypto/zlib.c
    index c3015733..739b8fc 100644
    --- a/crypto/zlib.c
    +++ b/crypto/zlib.c
    @@ -95,11 +95,10 @@ static int zlib_compress_setup(struct crypto_pcomp *tfm, void *params,
    zlib_comp_exit(ctx);

    workspacesize = zlib_deflate_workspacesize();
    - stream->workspace = vmalloc(workspacesize);
    + stream->workspace = vzalloc(workspacesize);
    if (!stream->workspace)
    return -ENOMEM;

    - memset(stream->workspace, 0, workspacesize);
    ret = zlib_deflateInit2(stream,
    tb[ZLIB_COMP_LEVEL]
    ? nla_get_u32(tb[ZLIB_COMP_LEVEL])
    --
    1.7.3.1.g432b3.dirty


    \
     
     \ /
      Last update: 2010-11-05 04:21    [W:0.019 / U:0.628 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site