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> Subject: [PATCH v2 2/9] lib: zstd: Add decompress_sources.h for decompress_unzstd Date: Tue, 22 Sep 2020 14:09:17 -0700 [thread overview] Message-ID: <20200922210924.1725-3-nickrterrell@gmail.com> (raw) In-Reply-To: <20200922210924.1725-1-nickrterrell@gmail.com> From: Nick Terrell <terrelln@fb.com> Adds decompress_sources.h which includes every .c file necessary for zstd decompression. This is used in decompress_unzstd.c so the internal structure of the library isn't exposed. This allows us to upgrade the zstd library version without modifying any callers. Instead we just need to update decompress_sources.h. Signed-off-by: Nick Terrell <terrelln@fb.com> --- lib/decompress_unzstd.c | 6 +----- lib/zstd/decompress_sources.h | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 5 deletions(-) create mode 100644 lib/zstd/decompress_sources.h diff --git a/lib/decompress_unzstd.c b/lib/decompress_unzstd.c index dbc290af26b4..a79f705f236d 100644 --- a/lib/decompress_unzstd.c +++ b/lib/decompress_unzstd.c @@ -68,11 +68,7 @@ #ifdef STATIC # define UNZSTD_PREBOOT # include "xxhash.c" -# include "zstd/entropy_common.c" -# include "zstd/fse_decompress.c" -# include "zstd/huf_decompress.c" -# include "zstd/zstd_common.c" -# include "zstd/decompress.c" +# include "zstd/decompress_sources.h" #endif #include <linux/decompress/mm.h> diff --git a/lib/zstd/decompress_sources.h b/lib/zstd/decompress_sources.h new file mode 100644 index 000000000000..ccb4960ea0cd --- /dev/null +++ b/lib/zstd/decompress_sources.h @@ -0,0 +1,14 @@ +// SPDX-License-Identifier: GPL-2.0-only + +/* + * This file includes every .c file needed for decompression. + * It is used by lib/decompress_unzstd.c to include the decompression + * source into the translation-unit, so it can be used for kernel + * decompression. + */ + +#include "entropy_common.c" +#include "fse_decompress.c" +#include "huf_decompress.c" +#include "zstd_common.c" +#include "decompress.c" -- 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>, 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 v2 2/9] lib: zstd: Add decompress_sources.h for decompress_unzstd Date: Tue, 22 Sep 2020 14:09:17 -0700 [thread overview] Message-ID: <20200922210924.1725-3-nickrterrell@gmail.com> (raw) In-Reply-To: <20200922210924.1725-1-nickrterrell@gmail.com> From: Nick Terrell <terrelln@fb.com> Adds decompress_sources.h which includes every .c file necessary for zstd decompression. This is used in decompress_unzstd.c so the internal structure of the library isn't exposed. This allows us to upgrade the zstd library version without modifying any callers. Instead we just need to update decompress_sources.h. Signed-off-by: Nick Terrell <terrelln@fb.com> --- lib/decompress_unzstd.c | 6 +----- lib/zstd/decompress_sources.h | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 5 deletions(-) create mode 100644 lib/zstd/decompress_sources.h diff --git a/lib/decompress_unzstd.c b/lib/decompress_unzstd.c index dbc290af26b4..a79f705f236d 100644 --- a/lib/decompress_unzstd.c +++ b/lib/decompress_unzstd.c @@ -68,11 +68,7 @@ #ifdef STATIC # define UNZSTD_PREBOOT # include "xxhash.c" -# include "zstd/entropy_common.c" -# include "zstd/fse_decompress.c" -# include "zstd/huf_decompress.c" -# include "zstd/zstd_common.c" -# include "zstd/decompress.c" +# include "zstd/decompress_sources.h" #endif #include <linux/decompress/mm.h> diff --git a/lib/zstd/decompress_sources.h b/lib/zstd/decompress_sources.h new file mode 100644 index 000000000000..ccb4960ea0cd --- /dev/null +++ b/lib/zstd/decompress_sources.h @@ -0,0 +1,14 @@ +// SPDX-License-Identifier: GPL-2.0-only + +/* + * This file includes every .c file needed for decompression. + * It is used by lib/decompress_unzstd.c to include the decompression + * source into the translation-unit, so it can be used for kernel + * decompression. + */ + +#include "entropy_common.c" +#include "fse_decompress.c" +#include "huf_decompress.c" +#include "zstd_common.c" +#include "decompress.c" -- 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-22 21:05 UTC|newest] Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-09-22 21:09 [PATCH v2 0/9] Update to zstd-1.4.6 Nick Terrell 2020-09-22 21:09 ` [f2fs-dev] " Nick Terrell 2020-09-22 21:09 ` [PATCH v2 1/9] lib: zstd: Add zstd compatibility wrapper Nick Terrell 2020-09-22 21:09 ` [f2fs-dev] " Nick Terrell 2020-09-22 21:09 ` Nick Terrell [this message] 2020-09-22 21:09 ` [f2fs-dev] [PATCH v2 2/9] lib: zstd: Add decompress_sources.h for decompress_unzstd Nick Terrell 2020-09-22 21:09 ` [PATCH v2 3/9] lib: zstd: Upgrade to latest upstream zstd version 1.4.6 Nick Terrell 2020-09-22 21:09 ` [f2fs-dev] " Nick Terrell 2020-09-23 15:31 ` kernel test robot 2020-09-23 15:31 ` kernel test robot 2020-09-22 21:09 ` [PATCH v2 4/9] crypto: zstd: Switch to zstd-1.4.6 API Nick Terrell 2020-09-22 21:09 ` [f2fs-dev] " Nick Terrell 2020-09-22 21:09 ` [PATCH v2 5/9] btrfs: zstd: Switch to the " Nick Terrell 2020-09-22 21:09 ` [f2fs-dev] " Nick Terrell 2020-09-22 21:09 ` [PATCH v2 6/9] f2fs: " Nick Terrell 2020-09-22 21:09 ` [f2fs-dev] " Nick Terrell 2020-09-22 21:09 ` [PATCH v2 7/9] squashfs: " Nick Terrell 2020-09-22 21:09 ` [f2fs-dev] " Nick Terrell 2020-09-22 21:09 ` [PATCH v2 8/9] lib: unzstd: " Nick Terrell 2020-09-22 21:09 ` [f2fs-dev] " Nick Terrell 2020-09-22 21:09 ` [PATCH v2 9/9] lib: zstd: Remove zstd compatibility wrapper Nick Terrell 2020-09-22 21:09 ` [f2fs-dev] " Nick Terrell 2020-09-23 5:57 ` [PATCH v2 0/9] Update to zstd-1.4.6 Christoph Hellwig 2020-09-23 5:57 ` [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=20200922210924.1725-3-nickrterrell@gmail.com \ --to=nickrterrell@gmail.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=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.