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>,
"Michał Mirosław" <mirq-linux@rere.qmqm.pl>,
"David Sterba" <dsterba@suse.cz>,
"Oleksandr Natalenko" <oleksandr@natalenko.name>,
"Felix Handte" <felixh@fb.com>,
"Eric Biggers" <ebiggers@kernel.org>
Subject: [PATCH v10 2/4] lib: zstd: Add decompress_sources.h for decompress_unzstd
Date: Mon, 26 Apr 2021 16:46:19 -0700 [thread overview]
Message-ID: <20210426234621.870684-3-nickrterrell@gmail.com> (raw)
In-Reply-To: <20210426234621.870684-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 | 23 +++++++++++++++++++++++
2 files changed, 24 insertions(+), 5 deletions(-)
create mode 100644 lib/zstd/decompress_sources.h
diff --git a/lib/decompress_unzstd.c b/lib/decompress_unzstd.c
index c88aad49e996..6e5ecfba0a8d 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..d82cea4316f5
--- /dev/null
+++ b/lib/zstd/decompress_sources.h
@@ -0,0 +1,23 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/*
+ * Copyright (c) Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under both the BSD-style license (found in the
+ * LICENSE file in the root directory of this source tree) and the GPLv2 (found
+ * in the COPYING file in the root directory of this source tree).
+ * You may select, at your option, one of the above-listed licenses.
+ */
+
+/*
+ * 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.31.1
next prev parent reply other threads:[~2021-04-26 23:41 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-26 23:46 [GIT PULL][PATCH v10 0/4] Update to zstd-1.4.10 Nick Terrell
2021-04-26 23:46 ` [PATCH v10 1/4] lib: zstd: Add kernel-specific API Nick Terrell
2021-04-26 23:46 ` Nick Terrell [this message]
2021-04-26 23:46 ` [PATCH v10 3/4] lib: zstd: Upgrade to latest upstream zstd version 1.4.10 Nick Terrell
2021-04-27 3:57 ` kernel test robot
2021-04-26 23:46 ` [PATCH v10 4/4] MAINTAINERS: Add maintainer entry for zstd Nick Terrell
2021-04-27 6:26 ` [GIT PULL][PATCH v10 0/4] Update to zstd-1.4.10 Oleksandr Natalenko
2021-04-27 22:09 ` Randy Dunlap
2021-04-27 23:39 ` 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=20210426234621.870684-3-nickrterrell@gmail.com \
--to=nickrterrell@gmail.com \
--cc=Kernel-team@fb.com \
--cc=clm@fb.com \
--cc=cyan@fb.com \
--cc=dsterba@suse.cz \
--cc=ebiggers@kernel.org \
--cc=felixh@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=mirq-linux@rere.qmqm.pl \
--cc=niketa@fb.com \
--cc=oleksandr@natalenko.name \
--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).