Merge tag 'mm-stable-2022-08-03' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / fs / squashfs / zstd_wrapper.c

diff --git a/fs/squashfs/zstd_wrapper.c b/fs/squashfs/zstd_wrapper.c
index 0015cf8..c40445d 100644 (file)
--- a/fs/squashfs/zstd_wrapper.c
+++ b/fs/squashfs/zstd_wrapper.c
@@ -34,7 +34,7 @@ static void *zstd_init(struct squashfs_sb_info *msblk, void *buff)
                goto failed;
        wksp->window_size = max_t(size_t,
                        msblk->block_size, SQUASHFS_METADATA_SIZE);
-       wksp->mem_size = ZSTD_DStreamWorkspaceBound(wksp->window_size);
+       wksp->mem_size = zstd_dstream_workspace_bound(wksp->window_size);
        wksp->mem = vmalloc(wksp->mem_size);
        if (wksp->mem == NULL)
                goto failed;
@@ -63,15 +63,15 @@ static int zstd_uncompress(struct squashfs_sb_info *msblk, void *strm,
        struct squashfs_page_actor *output)
 {
        struct workspace *wksp = strm;
-       ZSTD_DStream *stream;
+       zstd_dstream *stream;
        size_t total_out = 0;
        int error = 0;
-       ZSTD_inBuffer in_buf = { NULL, 0, 0 };
-       ZSTD_outBuffer out_buf = { NULL, 0, 0 };
+       zstd_in_buffer in_buf = { NULL, 0, 0 };
+       zstd_out_buffer out_buf = { NULL, 0, 0 };
        struct bvec_iter_all iter_all = {};
        struct bio_vec *bvec = bvec_init_iter_all(&iter_all);
 
-       stream = ZSTD_initDStream(wksp->window_size, wksp->mem, wksp->mem_size);
+       stream = zstd_init_dstream(wksp->window_size, wksp->mem, wksp->mem_size);
 
        if (!stream) {
                ERROR("Failed to initialize zstd decompressor\n");
@@ -116,14 +116,14 @@ static int zstd_uncompress(struct squashfs_sb_info *msblk, void *strm,
                }
 
                total_out -= out_buf.pos;
-               zstd_err = ZSTD_decompressStream(stream, &out_buf, &in_buf);
+               zstd_err = zstd_decompress_stream(stream, &out_buf, &in_buf);
                total_out += out_buf.pos; /* add the additional data produced */
                if (zstd_err == 0)
                        break;
 
-               if (ZSTD_isError(zstd_err)) {
+               if (zstd_is_error(zstd_err)) {
                        ERROR("zstd decompression error: %d\n",
-                                       (int)ZSTD_getErrorCode(zstd_err));
+                                       (int)zstd_get_error_code(zstd_err));
                        error = -EIO;
                        break;
                }