From 79a85e13719eba7dbd47877d706f941d624be286 Mon Sep 17 00:00:00 2001 From: Nick Terrell Date: Tue, 2 May 2017 13:41:57 -0700 Subject: [PATCH] [btrfs] Update patch to use ZSTD_init{C,D}Stream() --- contrib/linux-kernel/btrfs.diff | 14 +++++++------- contrib/linux-kernel/fs/btrfs/zstd.c | 12 ++++++------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/contrib/linux-kernel/btrfs.diff b/contrib/linux-kernel/btrfs.diff index b0f8b924..51fc52fa 100644 --- 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 b7f319e7..010548ce 100644 --- 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; }