[btrfs] Update patch to use ZSTD_init{C,D}Stream()

diff --git a/contrib/linux-kernel/btrfs.diff b/contrib/linux-kernel/btrfs.diff
index b0f8b924b9980e5b9f023305876928903cb5295e..51fc52fad420f9e6d956d60ecbe229160dd97ee3 100644 (file)
--- a/contrib/linux-kernel/btrfs.diff
+++ b/contrib/linux-kernel/btrfs.diff
@@ -193,7 +193,7 @@ index 1f157fb..b0dec90 100644
        BTRFS_FEAT_ATTR_PTR(raid56),
 diff --git a/fs/btrfs/zstd.c b/fs/btrfs/zstd.c
 new file mode 100644
-index 0000000..b7f319e
+index 0000000..010548c
 --- /dev/null
 +++ b/fs/btrfs/zstd.c
 @@ -0,0 +1,415 @@
@@ -291,10 +291,10 @@ index 0000000..b7f319e
 +      *total_in = 0;
 +
 +      /* Initialize the stream */
-+      stream = ZSTD_createCStream(params, len, workspace->mem,
++      stream = ZSTD_initCStream(params, len, workspace->mem,
 +                      workspace->size);
 +      if (!stream) {
-+              pr_warn("BTRFS: ZSTD_createStream failed\n");
++              pr_warn("BTRFS: ZSTD_initStream failed\n");
 +              ret = -EIO;
 +              goto out;
 +      }
@@ -458,10 +458,10 @@ index 0000000..b7f319e
 +      ZSTD_inBuffer in_buf = { NULL, 0, 0 };
 +      ZSTD_outBuffer out_buf = { NULL, 0, 0 };
 +
-+      stream = ZSTD_createDStream(
++      stream = ZSTD_initDStream(
 +                      ZSTD_BTRFS_MAX_INPUT, workspace->mem, workspace->size);
 +      if (!stream) {
-+              pr_debug("BTRFS: ZSTD_createDStream failed\n");
++              pr_debug("BTRFS: ZSTD_initDStream failed\n");
 +              ret = -EIO;
 +              goto done;
 +      }
@@ -536,10 +536,10 @@ index 0000000..b7f319e
 +      unsigned long pg_offset = 0;
 +      char *kaddr;
 +
-+      stream = ZSTD_createDStream(
++      stream = ZSTD_initDStream(
 +                      ZSTD_BTRFS_MAX_INPUT, workspace->mem, workspace->size);
 +      if (!stream) {
-+              pr_warn("BTRFS: ZSTD_createDStream failed\n");
++              pr_warn("BTRFS: ZSTD_initDStream failed\n");
 +              ret = -EIO;
 +              goto finish;
 +      }

diff --git a/contrib/linux-kernel/fs/btrfs/zstd.c b/contrib/linux-kernel/fs/btrfs/zstd.c
index b7f319e7a934a5a1c7e2aa1bc05d0dcc42304776..010548cea50c42286f4c65bf3c5a9c167ccf70e5 100644 (file)
--- a/contrib/linux-kernel/fs/btrfs/zstd.c
+++ b/contrib/linux-kernel/fs/btrfs/zstd.c
@@ -92,10 +92,10 @@ static int zstd_compress_pages(struct list_head *ws,
        *total_in = 0;
 
        /* Initialize the stream */
-       stream = ZSTD_createCStream(params, len, workspace->mem,
+       stream = ZSTD_initCStream(params, len, workspace->mem,
                        workspace->size);
        if (!stream) {
-               pr_warn("BTRFS: ZSTD_createStream failed\n");
+               pr_warn("BTRFS: ZSTD_initStream failed\n");
                ret = -EIO;
                goto out;
        }
@@ -259,10 +259,10 @@ static int zstd_decompress_bio(struct list_head *ws, struct page **pages_in,
        ZSTD_inBuffer in_buf = { NULL, 0, 0 };
        ZSTD_outBuffer out_buf = { NULL, 0, 0 };
 
-       stream = ZSTD_createDStream(
+       stream = ZSTD_initDStream(
                        ZSTD_BTRFS_MAX_INPUT, workspace->mem, workspace->size);
        if (!stream) {
-               pr_debug("BTRFS: ZSTD_createDStream failed\n");
+               pr_debug("BTRFS: ZSTD_initDStream failed\n");
                ret = -EIO;
                goto done;
        }
@@ -337,10 +337,10 @@ static int zstd_decompress(struct list_head *ws, unsigned char *data_in,
        unsigned long pg_offset = 0;
        char *kaddr;
 
-       stream = ZSTD_createDStream(
+       stream = ZSTD_initDStream(
                        ZSTD_BTRFS_MAX_INPUT, workspace->mem, workspace->size);
        if (!stream) {
-               pr_warn("BTRFS: ZSTD_createDStream failed\n");
+               pr_warn("BTRFS: ZSTD_initDStream failed\n");
                ret = -EIO;
                goto finish;
        }