UBUNTU: Ubuntu-2.6.38-12.51

[linux-flexiantxendom0-natty.git] / crypto / deflate.c

diff --git a/crypto/deflate.c b/crypto/deflate.c
index f209368..cbc7a33 100644 (file)
--- a/crypto/deflate.c
+++ b/crypto/deflate.c
@@ -1,14 +1,14 @@
-/* 
+/*
  * Cryptographic API.
  *
  * Deflate algorithm (RFC 1951), implemented here primarily for use
  * by IPCOMP (RFC 3173 & RFC 2394).
  *
  * Copyright (c) 2003 James Morris <jmorris@intercode.com.au>
- * 
+ *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option) 
+ * Software Foundation; either version 2 of the License, or (at your option)
  * any later version.
  *
  * FIXME: deflate transforms will require up to a total of about 436k of kernel
@@ -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());
-       if (!stream->workspace ) {
+       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);
@@ -61,7 +60,7 @@ static int deflate_comp_init(struct deflate_ctx *ctx)
                ret = -EINVAL;
                goto out_free;
        }
-out:   
+out:
        return ret;
 out_free:
        vfree(stream->workspace);
@@ -74,7 +73,7 @@ static int deflate_decomp_init(struct deflate_ctx *ctx)
        struct z_stream_s *stream = &ctx->decomp_stream;
 
        stream->workspace = kzalloc(zlib_inflate_workspacesize(), GFP_KERNEL);
-       if (!stream->workspace ) {
+       if (!stream->workspace) {
                ret = -ENOMEM;
                goto out;
        }
@@ -102,10 +101,11 @@ static void deflate_decomp_exit(struct deflate_ctx *ctx)
        kfree(ctx->decomp_stream.workspace);
 }
 
-static int deflate_init(void *ctx)
+static int deflate_init(struct crypto_tfm *tfm)
 {
+       struct deflate_ctx *ctx = crypto_tfm_ctx(tfm);
        int ret;
-       
+
        ret = deflate_comp_init(ctx);
        if (ret)
                goto out;
@@ -116,17 +116,19 @@ out:
        return ret;
 }
 
-static void deflate_exit(void *ctx)
+static void deflate_exit(struct crypto_tfm *tfm)
 {
+       struct deflate_ctx *ctx = crypto_tfm_ctx(tfm);
+
        deflate_comp_exit(ctx);
        deflate_decomp_exit(ctx);
 }
 
-static int deflate_compress(void *ctx, const u8 *src, unsigned int slen,
-                           u8 *dst, unsigned int *dlen)
+static int deflate_compress(struct crypto_tfm *tfm, const u8 *src,
+                           unsigned int slen, u8 *dst, unsigned int *dlen)
 {
        int ret = 0;
-       struct deflate_ctx *dctx = ctx;
+       struct deflate_ctx *dctx = crypto_tfm_ctx(tfm);
        struct z_stream_s *stream = &dctx->comp_stream;
 
        ret = zlib_deflateReset(stream);
@@ -150,13 +152,13 @@ static int deflate_compress(void *ctx, const u8 *src, unsigned int slen,
 out:
        return ret;
 }
- 
-static int deflate_decompress(void *ctx, const u8 *src, unsigned int slen,
-                              u8 *dst, unsigned int *dlen)
+
+static int deflate_decompress(struct crypto_tfm *tfm, const u8 *src,
+                             unsigned int slen, u8 *dst, unsigned int *dlen)
 {
-       
+
        int ret = 0;
-       struct deflate_ctx *dctx = ctx;
+       struct deflate_ctx *dctx = crypto_tfm_ctx(tfm);
        struct z_stream_s *stream = &dctx->decomp_stream;
 
        ret = zlib_inflateReset(stream);
@@ -179,7 +181,7 @@ static int deflate_decompress(void *ctx, const u8 *src, unsigned int slen,
        if (ret == Z_OK && !stream->avail_in && stream->avail_out) {
                u8 zerostuff = 0;
                stream->next_in = &zerostuff;
-               stream->avail_in = 1; 
+               stream->avail_in = 1;
                ret = zlib_inflate(stream, Z_FINISH);
        }
        if (ret != Z_STREAM_END) {
@@ -198,25 +200,25 @@ static struct crypto_alg alg = {
        .cra_ctxsize            = sizeof(struct deflate_ctx),
        .cra_module             = THIS_MODULE,
        .cra_list               = LIST_HEAD_INIT(alg.cra_list),
+       .cra_init               = deflate_init,
+       .cra_exit               = deflate_exit,
        .cra_u                  = { .compress = {
-       .coa_init               = deflate_init,
-       .coa_exit               = deflate_exit,
        .coa_compress           = deflate_compress,
        .coa_decompress         = deflate_decompress } }
 };
 
-static int __init init(void)
+static int __init deflate_mod_init(void)
 {
        return crypto_register_alg(&alg);
 }
 
-static void __exit fini(void)
+static void __exit deflate_mod_fini(void)
 {
        crypto_unregister_alg(&alg);
 }
 
-module_init(init);
-module_exit(fini);
+module_init(deflate_mod_init);
+module_exit(deflate_mod_fini);
 
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("Deflate Compression Algorithm for IPCOMP");