From: Nick Terrell <nickrterrell@gmail.com> To: Herbert Xu <herbert@gondor.apana.org.au> Cc: linux-crypto@vger.kernel.org, linux-btrfs@vger.kernel.org, squashfs-devel@lists.sourceforge.net, linux-f2fs-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org, Kernel Team <Kernel-team@fb.com>, Nick Terrell <nickrterrell@gmail.com>, Nick Terrell <terrelln@fb.com>, Chris Mason <clm@fb.com>, Petr Malat <oss@malat.biz>, Johannes Weiner <jweiner@fb.com>, Niket Agarwal <niketa@fb.com>, Yann Collet <cyan@fb.com>, Christoph Hellwig <hch@infradead.org> Subject: [PATCH v4 7/9] squashfs: zstd: Switch to the zstd-1.4.6 API Date: Tue, 29 Sep 2020 23:53:16 -0700 [thread overview] Message-ID: <20200930065318.3326526-8-nickrterrell@gmail.com> (raw) In-Reply-To: <20200930065318.3326526-1-nickrterrell@gmail.com> From: Nick Terrell <terrelln@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 <terrelln@fb.com> --- fs/squashfs/zstd_wrapper.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/fs/squashfs/zstd_wrapper.c b/fs/squashfs/zstd_wrapper.c index f8c512a6204e..add582409866 100644 --- a/fs/squashfs/zstd_wrapper.c +++ b/fs/squashfs/zstd_wrapper.c @@ -11,7 +11,7 @@ #include <linux/mutex.h> #include <linux/bio.h> #include <linux/slab.h> -#include <linux/zstd_compat.h> +#include <linux/zstd.h> #include <linux/vmalloc.h> #include "squashfs_fs.h" @@ -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_estimateDStreamSize(wksp->window_size); wksp->mem = vmalloc(wksp->mem_size); if (wksp->mem == NULL) goto failed; @@ -71,7 +71,7 @@ static int zstd_uncompress(struct squashfs_sb_info *msblk, void *strm, 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_initStaticDStream(wksp->mem, wksp->mem_size); if (!stream) { ERROR("Failed to initialize zstd decompressor\n"); @@ -122,8 +122,7 @@ static int zstd_uncompress(struct squashfs_sb_info *msblk, void *strm, break; if (ZSTD_isError(zstd_err)) { - ERROR("zstd decompression error: %d\n", - (int)ZSTD_getErrorCode(zstd_err)); + ERROR("zstd decompression error: %s\n", ZSTD_getErrorName(zstd_err)); error = -EIO; break; } -- 2.28.0
WARNING: multiple messages have this Message-ID (diff)
From: Nick Terrell <nickrterrell@gmail.com> To: Herbert Xu <herbert@gondor.apana.org.au> Cc: squashfs-devel@lists.sourceforge.net, Johannes Weiner <jweiner@fb.com>, Christoph Hellwig <hch@infradead.org>, Nick Terrell <nickrterrell@gmail.com>, Yann Collet <cyan@fb.com>, linux-kernel@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, Petr Malat <oss@malat.biz>, Chris Mason <clm@fb.com>, Nick Terrell <terrelln@fb.com>, linux-crypto@vger.kernel.org, Kernel Team <Kernel-team@fb.com>, Niket Agarwal <niketa@fb.com>, linux-btrfs@vger.kernel.org Subject: [f2fs-dev] [PATCH v4 7/9] squashfs: zstd: Switch to the zstd-1.4.6 API Date: Tue, 29 Sep 2020 23:53:16 -0700 [thread overview] Message-ID: <20200930065318.3326526-8-nickrterrell@gmail.com> (raw) In-Reply-To: <20200930065318.3326526-1-nickrterrell@gmail.com> From: Nick Terrell <terrelln@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 <terrelln@fb.com> --- fs/squashfs/zstd_wrapper.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/fs/squashfs/zstd_wrapper.c b/fs/squashfs/zstd_wrapper.c index f8c512a6204e..add582409866 100644 --- a/fs/squashfs/zstd_wrapper.c +++ b/fs/squashfs/zstd_wrapper.c @@ -11,7 +11,7 @@ #include <linux/mutex.h> #include <linux/bio.h> #include <linux/slab.h> -#include <linux/zstd_compat.h> +#include <linux/zstd.h> #include <linux/vmalloc.h> #include "squashfs_fs.h" @@ -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_estimateDStreamSize(wksp->window_size); wksp->mem = vmalloc(wksp->mem_size); if (wksp->mem == NULL) goto failed; @@ -71,7 +71,7 @@ static int zstd_uncompress(struct squashfs_sb_info *msblk, void *strm, 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_initStaticDStream(wksp->mem, wksp->mem_size); if (!stream) { ERROR("Failed to initialize zstd decompressor\n"); @@ -122,8 +122,7 @@ static int zstd_uncompress(struct squashfs_sb_info *msblk, void *strm, break; if (ZSTD_isError(zstd_err)) { - ERROR("zstd decompression error: %d\n", - (int)ZSTD_getErrorCode(zstd_err)); + ERROR("zstd decompression error: %s\n", ZSTD_getErrorName(zstd_err)); error = -EIO; break; } -- 2.28.0 _______________________________________________ Linux-f2fs-devel mailing list Linux-f2fs-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
next prev parent reply other threads:[~2020-09-30 6:50 UTC|newest] Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-09-30 6:53 [PATCH v4 0/9] Update to zstd-1.4.6 Nick Terrell 2020-09-30 6:53 ` [f2fs-dev] " Nick Terrell 2020-09-30 6:53 ` [PATCH v4 1/9] lib: zstd: Add zstd compatibility wrapper Nick Terrell 2020-09-30 6:53 ` [f2fs-dev] " Nick Terrell 2020-09-30 6:53 ` [PATCH v4 2/9] lib: zstd: Add decompress_sources.h for decompress_unzstd Nick Terrell 2020-09-30 6:53 ` [f2fs-dev] " Nick Terrell 2020-09-30 6:53 ` [PATCH v4 3/9] lib: zstd: Upgrade to latest upstream zstd version 1.4.6 Nick Terrell 2020-09-30 6:53 ` [f2fs-dev] " Nick Terrell 2020-10-01 20:50 ` kernel test robot 2020-10-01 20:50 ` kernel test robot 2020-10-01 20:50 ` [PATCH] lib: zstd: fix semicolon.cocci warnings kernel test robot 2020-10-01 20:50 ` kernel test robot 2020-10-01 20:50 ` [f2fs-dev] " kernel test robot 2020-09-30 6:53 ` [PATCH v4 4/9] crypto: zstd: Switch to zstd-1.4.6 API Nick Terrell 2020-09-30 6:53 ` [f2fs-dev] " Nick Terrell 2020-09-30 6:53 ` [PATCH v4 5/9] btrfs: zstd: Switch to the " Nick Terrell 2020-09-30 6:53 ` [f2fs-dev] " Nick Terrell 2020-09-30 6:53 ` [PATCH v4 6/9] f2fs: " Nick Terrell 2020-09-30 6:53 ` [f2fs-dev] " Nick Terrell 2020-09-30 6:53 ` Nick Terrell [this message] 2020-09-30 6:53 ` [f2fs-dev] [PATCH v4 7/9] squashfs: " Nick Terrell 2020-09-30 6:53 ` [PATCH v4 8/9] lib: unzstd: " Nick Terrell 2020-09-30 6:53 ` [f2fs-dev] " Nick Terrell 2020-09-30 6:53 ` [PATCH v4 9/9] lib: zstd: Remove zstd compatibility wrapper Nick Terrell 2020-09-30 6:53 ` [f2fs-dev] " Nick Terrell 2020-09-30 6:53 ` [PATCH v4 0/9] Update to zstd-1.4.6 Christoph Hellwig 2020-09-30 6:53 ` [f2fs-dev] " Christoph Hellwig 2020-09-30 20:05 ` Nick Terrell 2020-09-30 20:05 ` [f2fs-dev] " Nick Terrell via Linux-f2fs-devel 2020-10-02 6:54 ` Christoph Hellwig 2020-10-02 6:54 ` [f2fs-dev] " Christoph Hellwig 2020-10-02 13:42 ` Chris Mason 2020-10-02 13:42 ` [f2fs-dev] " Chris Mason via Linux-f2fs-devel 2020-09-30 20:49 ` [GIT PULL][PATCH " Nick Terrell 2020-09-30 20:49 ` [f2fs-dev] " Nick Terrell via Linux-f2fs-devel 2020-10-01 10:18 ` David Sterba 2020-10-01 10:18 ` [f2fs-dev] " David Sterba 2020-10-01 18:35 ` Nick Terrell 2020-10-01 18:35 ` [f2fs-dev] " Nick Terrell via Linux-f2fs-devel 2020-10-02 6:56 ` Christoph Hellwig 2020-10-02 6:56 ` [f2fs-dev] " Christoph Hellwig
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200930065318.3326526-8-nickrterrell@gmail.com \ --to=nickrterrell@gmail.com \ --cc=Kernel-team@fb.com \ --cc=clm@fb.com \ --cc=cyan@fb.com \ --cc=hch@infradead.org \ --cc=herbert@gondor.apana.org.au \ --cc=jweiner@fb.com \ --cc=linux-btrfs@vger.kernel.org \ --cc=linux-crypto@vger.kernel.org \ --cc=linux-f2fs-devel@lists.sourceforge.net \ --cc=linux-kernel@vger.kernel.org \ --cc=niketa@fb.com \ --cc=oss@malat.biz \ --cc=squashfs-devel@lists.sourceforge.net \ --cc=terrelln@fb.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.