From: Josef Bacik <josef@toxicpanda.com>
To: Nick Terrell <nickrterrell@gmail.com>,
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 <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>
Subject: Re: [PATCH v5 5/9] btrfs: zstd: Switch to the zstd-1.4.6 API
Date: Fri, 6 Nov 2020 12:10:47 -0500 [thread overview]
Message-ID: <b12254bc-7320-7170-f39d-e76afe1a7561@toxicpanda.com> (raw)
In-Reply-To: <20201103060535.8460-6-nickrterrell@gmail.com>
On 11/3/20 1:05 AM, Nick Terrell wrote:
> 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/btrfs/zstd.c | 48 ++++++++++++++++++++++++++++--------------------
> 1 file changed, 28 insertions(+), 20 deletions(-)
>
> diff --git a/fs/btrfs/zstd.c b/fs/btrfs/zstd.c
> index a7367ff573d4..6b466e090cd7 100644
> --- a/fs/btrfs/zstd.c
> +++ b/fs/btrfs/zstd.c
> @@ -16,7 +16,7 @@
> #include <linux/refcount.h>
> #include <linux/sched.h>
> #include <linux/slab.h>
> -#include <linux/zstd_compat.h>
> +#include <linux/zstd.h>
> #include "misc.h"
> #include "compression.h"
> #include "ctree.h"
> @@ -159,8 +159,8 @@ static void zstd_calc_ws_mem_sizes(void)
> zstd_get_btrfs_parameters(level, ZSTD_BTRFS_MAX_INPUT);
> size_t level_size =
> max_t(size_t,
> - ZSTD_CStreamWorkspaceBound(params.cParams),
> - ZSTD_DStreamWorkspaceBound(ZSTD_BTRFS_MAX_INPUT));
> + ZSTD_estimateCStreamSize_usingCParams(params.cParams),
> + ZSTD_estimateDStreamSize(ZSTD_BTRFS_MAX_INPUT));
>
> max_size = max_t(size_t, max_size, level_size);
> zstd_ws_mem_sizes[level - 1] = max_size;
> @@ -389,13 +389,23 @@ int zstd_compress_pages(struct list_head *ws, struct address_space *mapping,
> *total_in = 0;
>
> /* Initialize the stream */
> - stream = ZSTD_initCStream(params, len, workspace->mem,
> - workspace->size);
> + stream = ZSTD_initStaticCStream(workspace->mem, workspace->size);
> if (!stream) {
> - pr_warn("BTRFS: ZSTD_initCStream failed\n");
> + pr_warn("BTRFS: ZSTD_initStaticCStream failed\n");
> ret = -EIO;
> goto out;
> }
> + {
> + size_t ret2;
> +
> + ret2 = ZSTD_initCStream_advanced(stream, NULL, 0, params, len);
> + if (ZSTD_isError(ret2)) {
> + pr_warn("BTRFS: ZSTD_initCStream_advanced returned %s\n",
> + ZSTD_getErrorName(ret2));
> + ret = -EIO;
> + goto out;
> + }
> + }
Please don't do this, you can just add size_t ret2 at the top and not put this
in a block. Other than that the code looks fine, once you fix that you can add
Reviewed-by: Josef Bacik <josef@toxicpanda.com>
Thanks,
Josef
next prev parent reply other threads:[~2020-11-06 17:10 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-03 6:05 [GIT PULL][PATCH v5 0/9] Update to zstd-1.4.6 Nick Terrell
2020-11-03 6:05 ` [PATCH v5 1/9] lib: zstd: Add zstd compatibility wrapper Nick Terrell
2020-11-06 18:38 ` Christoph Hellwig
2020-11-09 19:01 ` Chris Mason
2020-11-10 15:25 ` David Sterba
2020-11-10 19:33 ` Nick Terrell
2020-11-10 18:39 ` Christoph Hellwig
2020-11-10 19:24 ` Chris Mason
2020-11-16 16:52 ` Christoph Hellwig
2020-11-10 20:38 ` Nick Terrell
2020-11-03 6:05 ` [PATCH v5 2/9] lib: zstd: Add decompress_sources.h for decompress_unzstd Nick Terrell
2020-11-03 6:05 ` [PATCH v5 4/9] crypto: zstd: Switch to zstd-1.4.6 API Nick Terrell
2020-11-03 6:05 ` [PATCH v5 5/9] btrfs: zstd: Switch to the " Nick Terrell
2020-11-06 17:10 ` Josef Bacik [this message]
2020-11-06 18:36 ` Nick Terrell
2020-11-03 6:05 ` [PATCH v5 6/9] f2fs: " Nick Terrell
2020-11-03 6:05 ` [PATCH v5 7/9] squashfs: " Nick Terrell
2020-11-03 6:05 ` [PATCH v5 8/9] lib: unzstd: " Nick Terrell
2020-11-03 6:05 ` [PATCH v5 9/9] lib: zstd: Remove zstd compatibility wrapper Nick Terrell
2020-11-06 17:15 ` [GIT PULL][PATCH v5 0/9] Update to zstd-1.4.6 Josef Bacik
2020-11-06 18:51 ` Nick Terrell
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=b12254bc-7320-7170-f39d-e76afe1a7561@toxicpanda.com \
--to=josef@toxicpanda.com \
--cc=Kernel-team@fb.com \
--cc=clm@fb.com \
--cc=cyan@fb.com \
--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=nickrterrell@gmail.com \
--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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).