[PATCH v5 4/9] crypto: zstd: Switch to zstd-1.4.6 API

[Nick Terrell]

From: Nick Terrell <terre...@fb.com>

Move away from the compatibility wrapper to the zstd-1.4.6 API. This
code is functionally equivalent.

Signed-off-by: Nick Terrell <terre...@fb.com>
---
 crypto/zstd.c | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/crypto/zstd.c b/crypto/zstd.c
index dcda3cad3b5c..767fe2fbe009 100644
--- a/crypto/zstd.c
+++ b/crypto/zstd.c
@@ -11,7 +11,7 @@
 #include <linux/module.h>
 #include <linux/net.h>
 #include <linux/vmalloc.h>
-#include <linux/zstd_compat.h>
+#include <linux/zstd.h>
 #include <crypto/internal/scompress.h>
 
 
@@ -24,16 +24,15 @@ struct zstd_ctx {
        void *dwksp;
 };
 
-static ZSTD_parameters zstd_params(void)
-{
-       return ZSTD_getParams(ZSTD_DEF_LEVEL, 0, 0);
-}
-
 static int zstd_comp_init(struct zstd_ctx *ctx)
 {
        int ret = 0;
-       const ZSTD_parameters params = zstd_params();
-       const size_t wksp_size = ZSTD_CCtxWorkspaceBound(params.cParams);
+       const size_t wksp_size = ZSTD_estimateCCtxSize(ZSTD_DEF_LEVEL);
+
+       if (ZSTD_isError(wksp_size)) {
+               ret = -EINVAL;
+               goto out_free;
+       }
 
        ctx->cwksp = vzalloc(wksp_size);
        if (!ctx->cwksp) {
@@ -41,7 +40,7 @@ static int zstd_comp_init(struct zstd_ctx *ctx)
                goto out;
        }
 
-       ctx->cctx = ZSTD_initCCtx(ctx->cwksp, wksp_size);
+       ctx->cctx = ZSTD_initStaticCCtx(ctx->cwksp, wksp_size);
        if (!ctx->cctx) {
                ret = -EINVAL;
                goto out_free;
@@ -56,7 +55,7 @@ static int zstd_comp_init(struct zstd_ctx *ctx)
 static int zstd_decomp_init(struct zstd_ctx *ctx)
 {
        int ret = 0;
-       const size_t wksp_size = ZSTD_DCtxWorkspaceBound();
+       const size_t wksp_size = ZSTD_estimateDCtxSize();
 
        ctx->dwksp = vzalloc(wksp_size);
        if (!ctx->dwksp) {
@@ -64,7 +63,7 @@ static int zstd_decomp_init(struct zstd_ctx *ctx)
                goto out;
        }
 
-       ctx->dctx = ZSTD_initDCtx(ctx->dwksp, wksp_size);
+       ctx->dctx = ZSTD_initStaticDCtx(ctx->dwksp, wksp_size);
        if (!ctx->dctx) {
                ret = -EINVAL;
                goto out_free;
@@ -152,9 +151,8 @@ static int __zstd_compress(const u8 *src, unsigned int slen,
 {
        size_t out_len;
        struct zstd_ctx *zctx = ctx;
-       const ZSTD_parameters params = zstd_params();
 
-       out_len = ZSTD_compressCCtx(zctx->cctx, dst, *dlen, src, slen, params);
+       out_len = ZSTD_compressCCtx(zctx->cctx, dst, *dlen, src, slen, 
ZSTD_DEF_LEVEL);
        if (ZSTD_isError(out_len))
                return -EINVAL;
        *dlen = out_len;
-- 
2.28.0